btrfs: export helpers for subvolume name/id resolution

[ Upstream commit c0c907a47dccf2cf26251a8fb4a8e7a3bf79ce84 ]

The functions will be used outside of export.c and super.c to allow
resolving subvolume name from a given id, eg. for subvolume deletion by
id ioctl.

Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ split from the next patch ]
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 038580b1f58b21405be3349eecc8ae8104e9fbc9)

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 2f1d67f3efe963814af7fb29f497f57121d4de40..108ebf008a4c325fec8885162c02e098078a4ce7 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -2968,6 +2968,8 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
 int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
                        unsigned long new_flags);
 int btrfs_sync_fs(struct super_block *sb, int wait);
+char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
+                                         u64 subvol_objectid);
 
 static inline __printf(2, 3) __cold
 void btrfs_no_printk(const struct btrfs_fs_info *fs_info, const char *fmt, ...)

diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c
index 72e312cae69d9e2576c4af40e6a700447b66004b..d9253545fd18d07c0a8f409e134e67a5998d5ab0 100644 (file)
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
@@ -57,9 +57,9 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len,
        return type;
 }
 
-static struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
-                                      u64 root_objectid, u32 generation,
-                                      int check_generation)
+struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
+                               u64 root_objectid, u32 generation,
+                               int check_generation)
 {
        struct btrfs_fs_info *fs_info = btrfs_sb(sb);
        struct btrfs_root *root;
@@ -152,7 +152,7 @@ static struct dentry *btrfs_fh_to_dentry(struct super_block *sb, struct fid *fh,
        return btrfs_get_dentry(sb, objectid, root_objectid, generation, 1);
 }
 
-static struct dentry *btrfs_get_parent(struct dentry *child)
+struct dentry *btrfs_get_parent(struct dentry *child)
 {
        struct inode *dir = d_inode(child);
        struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);

diff --git a/fs/btrfs/export.h b/fs/btrfs/export.h
index 57488ecd7d4ef59adb0c57f3836d2803eb3170ed..f32f4113c976a95a072a65e558810ebc561a2a51 100644 (file)
--- a/fs/btrfs/export.h
+++ b/fs/btrfs/export.h
@@ -18,4 +18,9 @@ struct btrfs_fid {
        u64 parent_root_objectid;
 } __attribute__ ((packed));
 
+struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,
+                               u64 root_objectid, u32 generation,
+                               int check_generation);
+struct dentry *btrfs_get_parent(struct dentry *child);
+
 #endif

diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index ad4ef20306acc9044cdb15e6baa431f0a42b458c..d03da1cf37c95ccc361be20ef03d86de421f74e8 100644 (file)
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -1009,8 +1009,8 @@ out:
        return error;
 }
 
-static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
-                                          u64 subvol_objectid)
+char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,
+                                         u64 subvol_objectid)
 {
        struct btrfs_root *root = fs_info->tree_root;
        struct btrfs_root *fs_root;
@@ -1421,8 +1421,8 @@ static struct dentry *mount_subvol(const char *subvol_name, u64 subvol_objectid,
                                goto out;
                        }
                }
-               subvol_name = get_subvol_name_from_objectid(btrfs_sb(mnt->mnt_sb),
-                                                           subvol_objectid);
+               subvol_name = btrfs_get_subvol_name_from_objectid(
+                                       btrfs_sb(mnt->mnt_sb), subvol_objectid);
                if (IS_ERR(subvol_name)) {
                        root = ERR_CAST(subvol_name);
                        subvol_name = NULL;