commit 6aa2cc49b1cb27cc79c744ae86cce0b52488b35c
author Qu Wenruo <wqu@suse.com> Wed Jun 24 18:03:08 2020 +0200
committer Tom Rini <trini@konsulko.com> Mon Sep 07 20:57:27 2020 -0400
tree e6cb5b9ac3323a1b4e7f5ab7df3039d6205aab38
parent f9344c3b0d7bc609cee537e87e1bedcae9f0dcca

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>

fs/btrfs/btrfs.h

diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h
index e36bd89..32ea2fc 100644
--- a/fs/btrfs/btrfs.h
+++ b/fs/btrfs/btrfs.h
@@ -58,16 +58,16 @@
 int btrfs_readlink(struct btrfs_root *root, u64 ino, char *target);
 u64 __btrfs_lookup_path(struct __btrfs_root *, u64, const char *, u8 *,
 		       struct btrfs_inode_item *, int);
-u64 btrfs_file_read(const struct __btrfs_root *, u64, u64, u64, char *);
+u64 __btrfs_file_read(const struct __btrfs_root *, u64, u64, u64, char *);
 
 /* subvolume.c */
 u64 btrfs_get_default_subvol_objectid(void);
 
 /* extent-io.c */
-u64 btrfs_read_extent_inline(struct __btrfs_path *,
+u64 __btrfs_read_extent_inline(struct __btrfs_path *,
 			      struct btrfs_file_extent_item *, u64, u64,
 			      char *);
-u64 btrfs_read_extent_reg(struct __btrfs_path *, struct btrfs_file_extent_item *,
+u64 __btrfs_read_extent_reg(struct __btrfs_path *, struct btrfs_file_extent_item *,
 			   u64, u64, char *);
 
 #endif /* !__BTRFS_BTRFS_H__ */