RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: use BTRFS_SUPER_INFO_SIZE to replace raw 4096 in btrfs-image 

Signed-off-by: Gui Hecheng <guihc.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Gui Hecheng 2014-06-26 10:53:06 +08:00 committed by David Sterba
parent cc1c1eab17
commit 5da89caa81
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
btrfs-image.c
View File

@ -1163,7 +1163,7 @@ static int copy_from_extent_tree(struct metadump_struct *metadump,
int ret; int ret;
extent_root = metadump->root->fs_info->extent_root; extent_root = metadump->root->fs_info->extent_root;
bytenr = BTRFS_SUPER_INFO_OFFSET + 4096; bytenr = BTRFS_SUPER_INFO_OFFSET + BTRFS_SUPER_INFO_SIZE;
key.objectid = bytenr; key.objectid = bytenr;
key.type = BTRFS_EXTENT_ITEM_KEY; key.type = BTRFS_EXTENT_ITEM_KEY;
key.offset = 0; key.offset = 0;
@ -1278,7 +1278,8 @@ static int create_metadump(const char *input, FILE *out, int num_threads,
return ret; return ret;
} }
ret = add_extent(BTRFS_SUPER_INFO_OFFSET, 4096, &metadump, 0); ret = add_extent(BTRFS_SUPER_INFO_OFFSET, BTRFS_SUPER_INFO_SIZE,
&metadump, 0);
if (ret) { if (ret) {
fprintf(stderr, "Error adding metadata %d\n", ret); fprintf(stderr, "Error adding metadata %d\n", ret);
err = ret; err = ret;
@ -1368,7 +1369,7 @@ static void update_super_old(u8 *buffer)
btrfs_set_stack_stripe_offset(&chunk->stripe, 0); btrfs_set_stack_stripe_offset(&chunk->stripe, 0);
memcpy(chunk->stripe.dev_uuid, super->dev_item.uuid, BTRFS_UUID_SIZE); memcpy(chunk->stripe.dev_uuid, super->dev_item.uuid, BTRFS_UUID_SIZE);
btrfs_set_super_sys_array_size(super, sizeof(*key) + sizeof(*chunk)); btrfs_set_super_sys_array_size(super, sizeof(*key) + sizeof(*chunk));
csum_block(buffer, 4096); csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
} }
static int update_super(u8 *buffer) static int update_super(u8 *buffer)
@ -1422,7 +1423,7 @@ static int update_super(u8 *buffer)
} }
btrfs_set_super_sys_array_size(super, new_array_size); btrfs_set_super_sys_array_size(super, new_array_size);
csum_block(buffer, 4096); csum_block(buffer, BTRFS_SUPER_INFO_SIZE);
return 0; return 0;
} }
@ -1569,12 +1570,12 @@ static void write_backup_supers(int fd, u8 *buf)
for (i = 1; i < BTRFS_SUPER_MIRROR_MAX; i++) { for (i = 1; i < BTRFS_SUPER_MIRROR_MAX; i++) {
bytenr = btrfs_sb_offset(i); bytenr = btrfs_sb_offset(i);
if (bytenr + 4096 > size) if (bytenr + BTRFS_SUPER_INFO_SIZE > size)
break; break;
btrfs_set_super_bytenr(super, bytenr); btrfs_set_super_bytenr(super, bytenr);
csum_block(buf, 4096); csum_block(buf, BTRFS_SUPER_INFO_SIZE);
ret = pwrite64(fd, buf, 4096, bytenr); ret = pwrite64(fd, buf, BTRFS_SUPER_INFO_SIZE, bytenr);
if (ret < 4096) { if (ret < BTRFS_SUPER_INFO_SIZE) {
if (ret < 0) if (ret < 0)
fprintf(stderr, "Problem writing out backup " fprintf(stderr, "Problem writing out backup "
"super block %d, err %d\n", i, errno); "super block %d, err %d\n", i, errno);