From: Greg Kurz <groug@kaod.org> To: Miklos Szeredi <miklos@szeredi.hu> Cc: linux-kernel@vger.kernel.org, Max Reitz <mreitz@redhat.com>, linux-fsdevel@vger.kernel.org, virtio-fs@redhat.com, Vivek Goyal <vgoyal@redhat.com>, Greg Kurz <groug@kaod.org> Subject: [PATCH v2 6/7] fuse: Switch to fc_mount() for submounts Date: Fri, 4 Jun 2021 18:11:55 +0200 [thread overview] Message-ID: <20210604161156.408496-7-groug@kaod.org> (raw) In-Reply-To: <20210604161156.408496-1-groug@kaod.org> 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> --- fs/fuse/dir.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index b88e5785a3dd..fc9eddf7f9b2 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -311,38 +311,22 @@ 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 (struct vfsmount *) 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); + mnt = fc_mount(fsc); + if (IS_ERR(mnt)) goto out_put_fsc; - } mntget(mnt); - put_fs_context(fsc); - return mnt; - out_put_fsc: put_fs_context(fsc); -out: - return ERR_PTR(err); + return mnt; } const struct dentry_operations fuse_dentry_operations = { -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Greg Kurz <groug@kaod.org> To: Miklos Szeredi <miklos@szeredi.hu> Cc: linux-kernel@vger.kernel.org, virtio-fs@redhat.com, linux-fsdevel@vger.kernel.org, Max Reitz <mreitz@redhat.com>, Vivek Goyal <vgoyal@redhat.com> Subject: [Virtio-fs] [PATCH v2 6/7] fuse: Switch to fc_mount() for submounts Date: Fri, 4 Jun 2021 18:11:55 +0200 [thread overview] Message-ID: <20210604161156.408496-7-groug@kaod.org> (raw) In-Reply-To: <20210604161156.408496-1-groug@kaod.org> 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> --- fs/fuse/dir.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index b88e5785a3dd..fc9eddf7f9b2 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -311,38 +311,22 @@ 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 (struct vfsmount *) 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); + mnt = fc_mount(fsc); + if (IS_ERR(mnt)) goto out_put_fsc; - } mntget(mnt); - put_fs_context(fsc); - return mnt; - out_put_fsc: put_fs_context(fsc); -out: - return ERR_PTR(err); + return mnt; } const struct dentry_operations fuse_dentry_operations = { -- 2.31.1
next prev parent reply other threads:[~2021-06-04 16:12 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-04 16:11 [PATCH v2 0/7] fuse: Some fixes for submounts Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-04 16:11 ` [PATCH v2 1/7] fuse: Fix crash in fuse_dentry_automount() error path Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-04 16:11 ` [PATCH v2 2/7] fuse: Fix crash if superblock of submount gets killed early Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-08 15:08 ` Max Reitz 2021-06-08 15:08 ` [Virtio-fs] " Max Reitz 2021-06-04 16:11 ` [PATCH v2 3/7] fuse: Fix infinite loop in sget_fc() Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-08 15:12 ` Max Reitz 2021-06-08 15:12 ` [Virtio-fs] " Max Reitz 2021-06-04 16:11 ` [PATCH v2 4/7] fuse: Add dedicated filesystem context ops for submounts Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-08 15:25 ` Max Reitz 2021-06-08 15:25 ` [Virtio-fs] " Max Reitz 2021-06-04 16:11 ` [PATCH v2 5/7] fuse: Call vfs_get_tree() " Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-08 15:40 ` Max Reitz 2021-06-08 15:40 ` [Virtio-fs] " Max Reitz 2021-06-04 16:11 ` Greg Kurz [this message] 2021-06-04 16:11 ` [Virtio-fs] [PATCH v2 6/7] fuse: Switch to fc_mount() " Greg Kurz 2021-06-08 15:51 ` Max Reitz 2021-06-08 15:51 ` [Virtio-fs] " Max Reitz 2021-06-09 7:45 ` Greg Kurz 2021-06-09 7:45 ` [Virtio-fs] " Greg Kurz 2021-06-11 14:44 ` Miklos Szeredi 2021-06-11 14:44 ` [Virtio-fs] " Miklos Szeredi 2021-06-04 16:11 ` [PATCH v2 7/7] fuse: Make fuse_fill_super_submount() static Greg Kurz 2021-06-04 16:11 ` [Virtio-fs] " Greg Kurz 2021-06-08 15:52 ` [PATCH v2 0/7] fuse: Some fixes for submounts Max Reitz 2021-06-08 15:52 ` [Virtio-fs] " Max Reitz 2021-06-09 7:46 ` Greg Kurz 2021-06-09 7:46 ` [Virtio-fs] " Greg Kurz
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210604161156.408496-7-groug@kaod.org \ --to=groug@kaod.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=miklos@szeredi.hu \ --cc=mreitz@redhat.com \ --cc=vgoyal@redhat.com \ --cc=virtio-fs@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.