Skip to contentSkip to conversation

btrfs-progs: btrfs-convert: Add larger device support

PATCH Superseded Lakshmipathi.G 2 participants 4 messages May 13, 2017 – Jun 2, 2017 1 message not in the archive Btrfs file system

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 btrfs-progs: btrfs-convert: Add larger device support

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

---
 convert/source-ext2.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
convert/source-ext2.c +6 -5
index 1b0576b..275cb89 100644
@@ -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;
Signature · 1 line
2.7.4

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw
Quoted 5 lines · Qu Wenruo
Quoted 1 line

Errr, it seems that you forgot to update ext2_open_fs() to update how we get cctx->block_counts.

Quoted 9 lines

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

#3 lore raw
Quoted 12 lines · Lakshmipathi.G
Quoted 11 lines · Qu Wenruo
Quoted 1 line

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.

Quoted 6 lines
Quoted 3 lines

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.

Quoted 2 lines

do we also need to change other fields like inodes_count and free_inode_count?

Yes please.

#4 lore raw
Quoted 3 lines

I think we should use the 64bit types just to be safe.

Dave, Okay made those changes and new patch sent.

Quoted 2 lines

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