Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd39b6f6 authored by Marcos Paulo de Souza's avatar Marcos Paulo de Souza Committed by Greg Kroah-Hartman
Browse files

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: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
[ split from the next patch ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2ef7ebb1

fs/btrfs/ctree.h

+2 −0
Original line number Diff line number Diff line
@@ -3271,6 +3271,8 @@ void btrfs_sysfs_remove_mounted(struct btrfs_fs_info *fs_info); 
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, ...)

fs/btrfs/export.c

+4 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 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,

struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid,

				u64 root_objectid, u32 generation,

				int check_generation)

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

fs/btrfs/export.h

+5 −0
Original line number Diff line number Diff line
@@ -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

fs/btrfs/super.c

+4 −4
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static int btrfs_parse_subvol_options(const char *options, char **subvol_name, 
	return error;

}



static char *get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,

char *btrfs_get_subvol_name_from_objectid(struct btrfs_fs_info *fs_info,

					  u64 subvol_objectid)

{

	struct btrfs_root *root = fs_info->tree_root;
@@ -1412,8 +1412,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;