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/btrfs.h | |
| parent | 5bbb68d5f0dba7759434b389432fec1967279c05 (diff) | |
| download | u-boot-0cc8fc65c15efde484f7f6a7444ef94ce86c13b1.tar.gz | |
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/btrfs.h')
| -rw-r--r-- | fs/btrfs/btrfs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/btrfs.h b/fs/btrfs/btrfs.h index e36bd89827..32ea2fc53a 100644 --- a/fs/btrfs/btrfs.h +++ b/fs/btrfs/btrfs.h @@ -58,16 +58,16 @@ int __btrfs_readlink(const struct __btrfs_root *, u64, char *); 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__ */ |