diff options
| author | Qu Wenruo <wqu@suse.com> | 2020-06-24 18:02:56 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-07 20:57:27 -0400 |
| commit | 33966de31fa698af8505fe99acc0298e565a60aa (patch) | |
| tree | 182416e16ac559e7e7df2f93ea09654f604042bc /fs/btrfs/subvolume.c | |
| parent | 75b0817babe733ecf8d503c3ecce371e9991ca76 (diff) | |
fs: btrfs: Rename struct btrfs_path to struct __btrfs_path
To avoid name conflicting between the extent buffer based btrfs_path
from btrfs-progs, rename struct btrfs_path to struct __btrfs_path.
Also rename btrfs_free_path() to __btrfs_free_path() to avoid conflicts.
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>
Diffstat (limited to 'fs/btrfs/subvolume.c')
| -rw-r--r-- | fs/btrfs/subvolume.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/subvolume.c b/fs/btrfs/subvolume.c index dbe92d13cb8..fa5ef1e0acb 100644 --- a/fs/btrfs/subvolume.c +++ b/fs/btrfs/subvolume.c @@ -81,7 +81,7 @@ u64 btrfs_get_default_subvol_objectid(void) static void list_subvols(u64 tree, char *nameptr, int max_name_len, int level) { struct btrfs_key key, *found_key; - struct btrfs_path path; + struct __btrfs_path path; struct btrfs_root_ref *ref; int res; @@ -116,7 +116,7 @@ static void list_subvols(u64 tree, char *nameptr, int max_name_len, int level) "subvolumes\n", __func__); } while (!(res = btrfs_next_slot(&path))); - btrfs_free_path(&path); + __btrfs_free_path(&path); } void btrfs_list_subvols(void) |