Commit 29e0e4df authored by Greg Kurz's avatar Greg Kurz Committed by Miklos Szeredi

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: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 266eb3f2
...@@ -311,38 +311,21 @@ static struct vfsmount *fuse_dentry_automount(struct path *path) ...@@ -311,38 +311,21 @@ static struct vfsmount *fuse_dentry_automount(struct path *path)
struct fs_context *fsc; struct fs_context *fsc;
struct vfsmount *mnt; struct vfsmount *mnt;
struct fuse_inode *mp_fi = get_fuse_inode(d_inode(path->dentry)); 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); fsc = fs_context_for_submount(path->mnt->mnt_sb->s_type, path->dentry);
if (IS_ERR(fsc)) { if (IS_ERR(fsc))
err = PTR_ERR(fsc); return ERR_CAST(fsc);
goto out;
}
/* Pass the FUSE inode of the mount for fuse_get_tree_submount() */ /* Pass the FUSE inode of the mount for fuse_get_tree_submount() */
fsc->fs_private = mp_fi; 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 */ /* Create the submount */
mnt = vfs_create_mount(fsc); mnt = fc_mount(fsc);
if (IS_ERR(mnt)) { if (!IS_ERR(mnt))
err = PTR_ERR(mnt); mntget(mnt);
goto out_put_fsc;
}
mntget(mnt);
put_fs_context(fsc);
return mnt;
out_put_fsc:
put_fs_context(fsc); put_fs_context(fsc);
out: return mnt;
return ERR_PTR(err);
} }
const struct dentry_operations fuse_dentry_operations = { const struct dentry_operations fuse_dentry_operations = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment