From 0cc8fc65c15efde484f7f6a7444ef94ce86c13b1 Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Wed, 24 Jun 2020 18:03:08 +0200 Subject: fs: btrfs: Rename btrfs_file_read() and its callees to avoid name conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename btrfs_file_read() and its callees to avoid name conflicts with the incoming new code. Signed-off-by: Qu Wenruo Reviewed-by: Marek Behún --- fs/btrfs/extent-io.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fs/btrfs/extent-io.c') diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c index a524145a66..ccf4da3177 100644 --- a/fs/btrfs/extent-io.c +++ b/fs/btrfs/extent-io.c @@ -14,7 +14,7 @@ #include "extent-io.h" #include "disk-io.h" -u64 btrfs_read_extent_inline(struct __btrfs_path *path, +u64 __btrfs_read_extent_inline(struct __btrfs_path *path, struct btrfs_file_extent_item *extent, u64 offset, u64 size, char *out) { @@ -66,7 +66,7 @@ err: return -1ULL; } -u64 btrfs_read_extent_reg(struct __btrfs_path *path, +u64 __btrfs_read_extent_reg(struct __btrfs_path *path, struct btrfs_file_extent_item *extent, u64 offset, u64 size, char *out) { -- cgit v1.2.3