lkml.org 
[lkml]   [2020]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 017/107] btrfs: export helpers for subvolume name/id resolution
    Date
    From: Marcos Paulo de Souza <mpdesouza@suse.com>

    [ 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>
    ---
    fs/btrfs/ctree.h | 2 ++
    fs/btrfs/export.c | 8 ++++----
    fs/btrfs/export.h | 5 +++++
    fs/btrfs/super.c | 8 ++++----
    4 files changed, 15 insertions(+), 8 deletions(-)

    diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
    index 2374f3f6f3b70..18357b054a91e 100644
    --- a/fs/btrfs/ctree.h
    +++ b/fs/btrfs/ctree.h
    @@ -2965,6 +2965,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 ddf28ecf17f93..93cceeba484cc 100644
    --- 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 57488ecd7d4ef..f32f4113c976a 100644
    --- 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 4b0ee34aa65d5..32c36821cc7b4 100644
    --- 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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-24 11:42    [W:4.506 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site