summaryrefslogtreecommitdiff
path: root/fs/fuse
diff options
context:
space:
mode:
authorGreg Kurz <groug@kaod.org>2021-06-04 18:11:55 +0200
committerMiklos Szeredi <mszeredi@redhat.com>2021-06-22 09:15:35 +0200
commit29e0e4df9d2bd1f7dd3c7293bf49e08a9d27e811 (patch)
tree78bc52d13f357e1662e3718104e6f2681ff39f28 /fs/fuse
parent266eb3f2fae488fd19ee5acfc01ba9d483715699 (diff)
fuse: Switch to fc_mount() for submounts
fc_mount() already handles the vfs_get_tree(), sb->s_umount unlocking and vfs_create_mount() sequence. Using it greatly simplifies fuse_dentry_automount(). Signed-off-by: Greg Kurz <groug@kaod.org> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs/fuse')
-rw-r--r--fs/fuse/dir.c29
1 files changed, 6 insertions, 23 deletions
diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index b88e5785a3dd..361150b7e807 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -311,38 +311,21 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)
struct fs_context *fsc;
struct vfsmount *mnt;
struct fuse_inode *mp_fi = get_fuse_inode(d_inode(path->dentry));
- int err;
fsc = fs_context_for_submount(path->mnt->mnt_sb->s_type, path->dentry);
- if (IS_ERR(fsc)) {
- err = PTR_ERR(fsc);
- goto out;
- }
+ if (IS_ERR(fsc))
+ return ERR_CAST(fsc);
/* Pass the FUSE inode of the mount for fuse_get_tree_submount() */
fsc->fs_private = mp_fi;
- err = vfs_get_tree(fsc);
- if (err)
- goto out_put_fsc;
-
- /* We are done configuring the superblock, so unlock it */
- up_write(&fsc->root->d_sb->s_umount);
-
/* Create the submount */
- mnt = vfs_create_mount(fsc);
- if (IS_ERR(mnt)) {
- err = PTR_ERR(mnt);
- goto out_put_fsc;
- }
- mntget(mnt);
- put_fs_context(fsc);
- return mnt;
+ mnt = fc_mount(fsc);
+ if (!IS_ERR(mnt))
+ mntget(mnt);
-out_put_fsc:
put_fs_context(fsc);
-out:
- return ERR_PTR(err);
+ return mnt;
}
const struct dentry_operations fuse_dentry_operations = {