From 3ec64ddf00c580be352a7954a7ac2b935d2479a4 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 23 Aug 2016 17:36:13 +0200 Subject: btrfs-progs: convert: move read_disk_extent Signed-off-by: David Sterba --- btrfs-convert.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'btrfs-convert.c') diff --git a/btrfs-convert.c b/btrfs-convert.c index b8684792..480ce9ee 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -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) -- cgit v1.2.3