diff options
| author | Qu Wenruo <wqu@suse.com> | 2020-06-24 18:03:08 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-07 20:57:27 -0400 |
| commit | 0cc8fc65c15efde484f7f6a7444ef94ce86c13b1 (patch) | |
| tree | e6cb5b9ac3323a1b4e7f5ab7df3039d6205aab38 /fs/btrfs/inode.c | |
| parent | 5bbb68d5f0dba7759434b389432fec1967279c05 (diff) | |
fs: btrfs: Rename btrfs_file_read() and its callees to avoid name conflicts
Rename btrfs_file_read() and its callees to avoid name conflicts with
the incoming new code.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 2e3fcad5a80..83d21467d9c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -598,7 +598,7 @@ u64 __btrfs_lookup_path(struct __btrfs_root *root, u64 inr, const char *path, return inr; } -u64 btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, +u64 __btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, u64 size, char *buf) { struct __btrfs_path path; @@ -633,11 +633,11 @@ u64 btrfs_file_read(const struct __btrfs_root *root, u64 inr, u64 offset, if (extent->type == BTRFS_FILE_EXTENT_INLINE) { btrfs_file_extent_item_to_cpu_inl(extent); - rd = btrfs_read_extent_inline(&path, extent, offset, + rd = __btrfs_read_extent_inline(&path, extent, offset, size, buf); } else { btrfs_file_extent_item_to_cpu(extent); - rd = btrfs_read_extent_reg(&path, extent, offset, size, + rd = __btrfs_read_extent_reg(&path, extent, offset, size, buf); } |