| Message ID | 20170513125632.GA10846@giis.co.in (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, May 15, 2017 at 09:40:29AM +0800, Qu Wenruo wrote: > >bug: https://bugzilla.kernel.org/show_bug.cgi?id=194795 > > Errr, it seems that you forgot to update ext2_open_fs() to update how we get > cctx->block_counts. > > Without that update, we still get wrong total size of original fs, so > converted image will be corrupted. > > In this 22T case, it can't pass convert test since after conversion, > converted image can't pass e2fsck. > > Thanks, > Qu > Thanks for pointing out the issue. So we need to update common.h/cctx->block_count from u32 to u64? do we also need to change other fields like inodes_count and free_inode_count? Cheers. Lakshmipathi.G -- 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
On Mon, May 15, 2017 at 02:06:54PM +0530, Lakshmipathi.G wrote: > On Mon, May 15, 2017 at 09:40:29AM +0800, Qu Wenruo wrote: > > >bug: https://bugzilla.kernel.org/show_bug.cgi?id=194795 > > > > Errr, it seems that you forgot to update ext2_open_fs() to update how we get > > cctx->block_counts. > > > > Without that update, we still get wrong total size of original fs, so > > converted image will be corrupted. > > > > In this 22T case, it can't pass convert test since after conversion, > > converted image can't pass e2fsck. > > > > Thanks, > > Qu > > > > Thanks for pointing out the issue. So we need to update > common.h/cctx->block_count from u32 to u64? I think we should use the 64bit types just to be safe. > do we also need to change other fields like inodes_count and > free_inode_count? Yes please. -- 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
> > I think we should use the 64bit types just to be safe. > Dave, Okay made those changes and new patch sent. >If we need to modify tons of things, then please split such modification to >different patches. Qu, Seems like only minor changes needed, so used a single patch. Cheers. Lakshmipathi.G -- 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
diff --git a/convert/source-ext2.c b/convert/source-ext2.c index 1b0576b..275cb89 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -34,8 +34,9 @@ static int ext2_open_fs(struct btrfs_convert_context *cctx, const char *name) ext2_filsys ext2_fs; ext2_ino_t ino; u32 ro_feature; + int open_flag = EXT2_FLAG_SOFTSUPP_FEATURES | EXT2_FLAG_64BITS; - ret = ext2fs_open(name, 0, 0, 0, unix_io_manager, &ext2_fs); + ret = ext2fs_open(name, open_flag, 0, 0, unix_io_manager, &ext2_fs); if (ret) { fprintf(stderr, "ext2fs_open: %s\n", error_message(ret)); return -1; @@ -148,7 +149,7 @@ static int ext2_read_used_space(struct btrfs_convert_context *cctx) return -ENOMEM; for (i = 0; i < fs->group_desc_count; i++) { - ret = ext2fs_get_block_bitmap_range(fs->block_map, blk_itr, + ret = ext2fs_get_block_bitmap_range2(fs->block_map, blk_itr, block_nbytes * 8, block_bitmap); if (ret) { error("fail to get bitmap from ext2, %s", @@ -353,7 +354,7 @@ static int ext2_create_symlink(struct btrfs_trans_handle *trans, int ret; char *pathname; u64 inode_size = btrfs_stack_inode_size(btrfs_inode); - if (ext2fs_inode_data_blocks(ext2_fs, ext2_inode)) { + if (ext2fs_inode_data_blocks2(ext2_fs, ext2_inode)) { btrfs_set_stack_inode_size(btrfs_inode, inode_size + 1); ret = ext2_create_file_extents(trans, root, objectid, btrfs_inode, ext2_fs, ext2_ino, @@ -627,9 +628,9 @@ static int ext2_copy_extended_attrs(struct btrfs_trans_handle *trans, ret = -ENOMEM; goto out; } - err = ext2fs_read_ext_attr(ext2_fs, ext2_inode->i_file_acl, buffer); + err = ext2fs_read_ext_attr2(ext2_fs, ext2_inode->i_file_acl, buffer); if (err) { - fprintf(stderr, "ext2fs_read_ext_attr: %s\n", + fprintf(stderr, "ext2fs_read_ext_attr2: %s\n", error_message(err)); ret = -1; goto out;
With larger file system (in this case its 22TB), ext2fs_open() returns EXT2_ET_CANT_USE_LEGACY_BITMAPS error message with ext2fs_read_block_bitmap(). To overcome this issue, we need pass EXT2_FLAG_64BITS flag with ext2fs_open and also use 64-bit functions like ext2fs_get_block_bitmap_range2, ext2fs_inode_data_blocks2,ext2fs_read_ext_attr2 bug: https://bugzilla.kernel.org/show_bug.cgi?id=194795 Signed-off-by: Lakshmipathi.G <Lakshmipathi.G@giis.co.in> --- convert/source-ext2.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)