On 7/3/13 8:25 AM, Miao Xie wrote: > Signed-off-by: Miao Xie <mi...@cn.fujitsu.com> > --- > 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; <giant snip> -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html