RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-17 10:16:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: convert: factor out block iteration callback

Browse Source 
block_iterate_proc uses the libext2fs error return codes when it doesn't
need them to return the error. We can push this out to __block_iterate_proc
and allow the reiserfs converter to share the code.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Jeff Mahoney 2015-06-05 23:41:09 +02:00 committed by David Sterba
parent 76c38116b3
commit 1f93b9d4ce
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
btrfs-convert.c
View File

@ -507,7 +507,7 @@ static int record_file_blocks(struct blk_iterate_data *data,
static int block_iterate_proc(u64 disk_block, u64 file_block, static int block_iterate_proc(u64 disk_block, u64 file_block,
struct blk_iterate_data *idata) struct blk_iterate_data *idata)
{ {
int ret; int ret = 0;
int sb_region; int sb_region;
int do_barrier; int do_barrier;
struct btrfs_root *root = idata->root; struct btrfs_root *root = idata->root;
@ -549,19 +549,23 @@ static int block_iterate_proc(u64 disk_block, u64 file_block,
idata->boundary = bytenr / root->sectorsize; idata->boundary = bytenr / root->sectorsize;
} }
idata->num_blocks++; idata->num_blocks++;
return 0;
fail: fail:
idata->errcode = ret; return ret;
return BLOCK_ABORT;
} }
static int __block_iterate_proc(ext2_filsys fs, blk_t *blocknr, static int __block_iterate_proc(ext2_filsys fs, blk_t *blocknr,
e2_blkcnt_t blockcnt, blk_t ref_block, e2_blkcnt_t blockcnt, blk_t ref_block,
int ref_offset, void *priv_data) int ref_offset, void *priv_data)
{ {
int ret;
struct blk_iterate_data *idata; struct blk_iterate_data *idata;
idata = (struct blk_iterate_data *)priv_data; idata = (struct blk_iterate_data *)priv_data;
return block_iterate_proc(*blocknr, blockcnt, idata); ret = block_iterate_proc(*blocknr, blockcnt, idata);
if (ret) {
idata->errcode = ret;
return BLOCK_ABORT;
}
return 0;
} }
/* /*
@ -1202,10 +1206,8 @@ static int create_image_file_range(struct btrfs_trans_handle *trans,
if (!ext2fs_fast_test_block_bitmap(ext2_fs->block_map, block)) if (!ext2fs_fast_test_block_bitmap(ext2_fs->block_map, block))
continue; continue;
ret = block_iterate_proc(block, block, &data); ret = block_iterate_proc(block, block, &data);
if (ret & BLOCK_ABORT) { if (ret < 0)
ret = data.errcode;
goto fail; goto fail;
}
} }
if (data.num_blocks > 0) { if (data.num_blocks > 0) {
ret = record_file_blocks(&data, data.first_block, ret = record_file_blocks(&data, data.first_block,
@ -1958,10 +1960,8 @@ static int relocate_one_reference(struct btrfs_trans_handle *trans,
ret = block_iterate_proc(new_pos / sectorsize, ret = block_iterate_proc(new_pos / sectorsize,
cur_offset / sectorsize, &data); cur_offset / sectorsize, &data);
if (ret & BLOCK_ABORT) { if (ret < 0)
ret = data.errcode;
goto fail; goto fail;
}
cur_offset += sectorsize; cur_offset += sectorsize;
bytenr += sectorsize; bytenr += sectorsize;