From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:29201 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010Ab3HDXnL (ORCPT ); Sun, 4 Aug 2013 19:43:11 -0400 Message-ID: <51FEE709.5040406@redhat.com> Date: Sun, 04 Aug 2013 18:43:05 -0500 From: Eric Sandeen MIME-Version: 1.0 To: Wang Shilong CC: Miao Xie , linux-btrfs@vger.kernel.org Subject: Re: [PATCH 04/12] Btrfs-progs: cleanup similar code in open_ctree_* and close_ctree References: <1372857920-4678-1-git-send-email-miaox@cn.fujitsu.com> <1372857920-4678-5-git-send-email-miaox@cn.fujitsu.com> <51FE7B7F.2090206@redhat.com> <4CB8CDC4-A52D-441E-B06A-F5D6A86FFB6D@gmail.com> In-Reply-To: <4CB8CDC4-A52D-441E-B06A-F5D6A86FFB6D@gmail.com> Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-btrfs-owner@vger.kernel.org List-ID: On 8/4/13 6:24 PM, Wang Shilong wrote: > Hello Eric, > > I have sent a patch to fix up this regression: > https://patchwork.kernel.org/patch/2828820/ > > Would you please try and see if this can solve problems. Ah, thanks. I missed that, I'll try it. Chris, maybe one to pick up sooner than later! -Eric > Thanks, > Wang >> On 7/3/13 8:25 AM, Miao Xie wrote: >>> Signed-off-by: Miao Xie >>> --- >>> btrfs-find-root.c | 137 +++------------- >>> disk-io.c | 473 +++++++++++++++++++++++++++++++----------------------- >>> disk-io.h | 12 ++ >>> 3 files changed, 307 insertions(+), 315 deletions(-) >> >> This broke at least btrfs-convert: >> >>> ./btrfs-convert fsfile >>> No valid Btrfs found on fsfile >>> unable to open ctree >>> conversion aborted. >> >> I read the detailed changelog carefully but it didn't help me >> understand the change, or how it might have broken. (yes, >> that's sarcasm ;) ). >> >> Can you take a look & see what is wrong with your change? >> >> Also, I guess we need a regression test for btrfs-convert. >> >> -Eric >> >>> diff --git a/btrfs-find-root.c b/btrfs-find-root.c >>> index da22c1d..f2cc1bf 100644 >>> --- a/btrfs-find-root.c >>> +++ b/btrfs-find-root.c >>> @@ -67,74 +67,31 @@ int csum_block(void *buf, u32 len) >>> >>> static struct btrfs_root *open_ctree_broken(int fd, const char *device) >>> { >>> - u32 sectorsize; >>> - u32 nodesize; >>> - u32 leafsize; >>> - u32 blocksize; >>> - u32 stripesize; >>> - u64 generation; >>> - struct btrfs_root *tree_root = malloc(sizeof(struct btrfs_root)); >>> - struct btrfs_root *extent_root = malloc(sizeof(struct btrfs_root)); >>> - struct btrfs_root *chunk_root = malloc(sizeof(struct btrfs_root)); >>> - struct btrfs_root *dev_root = malloc(sizeof(struct btrfs_root)); >>> - struct btrfs_root *csum_root = malloc(sizeof(struct btrfs_root)); >>> - struct btrfs_fs_info *fs_info = malloc(sizeof(*fs_info)); >>> - int ret; >> >> >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html >