leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: btrfs: Rename btrfs_file_read() and its callees to avoid name conflicts

Browse Source 
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>
This commit is contained in:
Qu Wenruo 2020-06-24 18:03:08 +02:00 committed by Tom Rini
parent 5bbb68d5f0
commit 0cc8fc65c1
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/btrfs.c
View File

@ -277,7 +277,7 @@ int btrfs_read(const char *file, void *buf, loff_t offset, loff_t len,
if (len > inode.size - offset)
len = inode.size - offset;
rd = btrfs_file_read(&root, inr, offset, len, buf);
rd = __btrfs_file_read(&root, inr, offset, len, buf);
if (rd == -1ULL) {
printf("An error occured while reading file %s\n", file);
return -1;

6
fs/btrfs/btrfs.h
View File

@ -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__ */

4
fs/btrfs/extent-io.c
View File

@ -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)
{

6
fs/btrfs/inode.c
View File

@ -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);
}