marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: Refactor sectorsize users in file.c 

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
master
Qu Wenruo 2017-05-18 10:06:40 +08:00 committed by David Sterba
parent 4925e1bc11
commit a124232f5d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
file.c
View File

@ -193,10 +193,10 @@ int btrfs_read_file(struct btrfs_root *root, u64 ino, u64 start, int len,
int read = 0; int read = 0;
int ret; int ret;
if (!IS_ALIGNED(start, root->sectorsize) || if (!IS_ALIGNED(start, root->fs_info->sectorsize) ||
!IS_ALIGNED(len, root->sectorsize)) { !IS_ALIGNED(len, root->fs_info->sectorsize)) {
warning("@start and @len must be aligned to %u for function %s", warning("@start and @len must be aligned to %u for function %s",
root->sectorsize, __func__); root->fs_info->sectorsize, __func__);
return -EINVAL; return -EINVAL;
} }
@ -260,7 +260,7 @@ int btrfs_read_file(struct btrfs_root *root, u64 ino, u64 start, int len,
goto next; goto next;
read_extent_buffer(leaf, dest, read_extent_buffer(leaf, dest,
btrfs_file_extent_inline_start(fi), extent_len); btrfs_file_extent_inline_start(fi), extent_len);
read += round_up(extent_len, root->sectorsize); read += round_up(extent_len, root->fs_info->sectorsize);
break; break;
} }
@ -319,7 +319,7 @@ next:
ii = btrfs_item_ptr(path.nodes[0], path.slots[0], ii = btrfs_item_ptr(path.nodes[0], path.slots[0],
struct btrfs_inode_item); struct btrfs_inode_item);
isize = round_up(btrfs_inode_size(path.nodes[0], ii), isize = round_up(btrfs_inode_size(path.nodes[0], ii),
root->sectorsize); root->fs_info->sectorsize);
read = min_t(u64, isize - start, len); read = min_t(u64, isize - start, len);
} }
out: out: