btrfs-progs: convert: move read_disk_extent

Signed-off-by: David Sterba <dsterba@suse.com>
master
David Sterba 2016-08-23 17:36:13 +02:00
parent 411de0cf4a
commit 3ec64ddf00
1 changed files with 16 additions and 16 deletions

View File

@ -173,6 +173,22 @@ static int convert_insert_dirent(struct btrfs_trans_handle *trans,
return 0;
}
static int read_disk_extent(struct btrfs_root *root, u64 bytenr,
u32 num_bytes, char *buffer)
{
int ret;
struct btrfs_fs_devices *fs_devs = root->fs_info->fs_devices;
ret = pread(fs_devs->latest_bdev, buffer, num_bytes, bytenr);
if (ret != num_bytes)
goto fail;
ret = 0;
fail:
if (ret > 0)
ret = -1;
return ret;
}
/*
* Open Ext2fs in readonly mode, read block allocation bitmap and
* inode bitmap into memory.
@ -414,22 +430,6 @@ error:
return -1;
}
static int read_disk_extent(struct btrfs_root *root, u64 bytenr,
u32 num_bytes, char *buffer)
{
int ret;
struct btrfs_fs_devices *fs_devs = root->fs_info->fs_devices;
ret = pread(fs_devs->latest_bdev, buffer, num_bytes, bytenr);
if (ret != num_bytes)
goto fail;
ret = 0;
fail:
if (ret > 0)
ret = -1;
return ret;
}
static int csum_disk_extent(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
u64 disk_bytenr, u64 num_bytes)