From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>, Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>, "Rafael J. Wysocki" <rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 02/21] fs: refactor ksys_umount Date: Sun, 26 Jul 2020 09:13:37 +0200 [thread overview] Message-ID: <20200726071356.287160-3-hch@lst.de> (raw) In-Reply-To: <20200726071356.287160-1-hch-jcswGhMUV9g@public.gmane.org> Factor out a path_umount helper that takes a struct path * instead of the actual file name. This will allow to convert the init and devtmpfs code to properly mount based on a kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init. Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- fs/namespace.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 6f8234f74bed90..43834b59eff6c3 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1706,36 +1706,19 @@ static inline bool may_mandlock(void) } #endif -/* - * Now umount can handle mount points as well as block devices. - * This is important for filesystems which use unnamed block devices. - * - * We now support a flag for forced unmount like the other 'big iron' - * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD - */ - -int ksys_umount(char __user *name, int flags) +static int path_umount(struct path *path, int flags) { - struct path path; struct mount *mnt; int retval; - int lookup_flags = LOOKUP_MOUNTPOINT; if (flags & ~(MNT_FORCE | MNT_DETACH | MNT_EXPIRE | UMOUNT_NOFOLLOW)) return -EINVAL; - if (!may_mount()) return -EPERM; - if (!(flags & UMOUNT_NOFOLLOW)) - lookup_flags |= LOOKUP_FOLLOW; - - retval = user_path_at(AT_FDCWD, name, lookup_flags, &path); - if (retval) - goto out; - mnt = real_mount(path.mnt); + mnt = real_mount(path->mnt); retval = -EINVAL; - if (path.dentry != path.mnt->mnt_root) + if (path->dentry != path->mnt->mnt_root) goto dput_and_out; if (!check_mnt(mnt)) goto dput_and_out; @@ -1748,12 +1731,25 @@ int ksys_umount(char __user *name, int flags) retval = do_umount(mnt, flags); dput_and_out: /* we mustn't call path_put() as that would clear mnt_expiry_mark */ - dput(path.dentry); + dput(path->dentry); mntput_no_expire(mnt); -out: return retval; } +int ksys_umount(char __user *name, int flags) +{ + int lookup_flags = LOOKUP_MOUNTPOINT; + struct path path; + int ret; + + if (!(flags & UMOUNT_NOFOLLOW)) + lookup_flags |= LOOKUP_FOLLOW; + ret = user_path_at(AT_FDCWD, name, lookup_flags, &path); + if (ret) + return ret; + return path_umount(&path, flags); +} + SYSCALL_DEFINE2(umount, char __user *, name, int, flags) { return ksys_umount(name, flags); -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Al Viro <viro@zeniv.linux.org.uk>, Linus Torvalds <torvalds@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org>, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 02/21] fs: refactor ksys_umount Date: Sun, 26 Jul 2020 09:13:37 +0200 [thread overview] Message-ID: <20200726071356.287160-3-hch@lst.de> (raw) In-Reply-To: <20200726071356.287160-1-hch@lst.de> Factor out a path_umount helper that takes a struct path * instead of the actual file name. This will allow to convert the init and devtmpfs code to properly mount based on a kernel pointer instead of relying on the implicit set_fs(KERNEL_DS) during early init. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/namespace.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/fs/namespace.c b/fs/namespace.c index 6f8234f74bed90..43834b59eff6c3 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1706,36 +1706,19 @@ static inline bool may_mandlock(void) } #endif -/* - * Now umount can handle mount points as well as block devices. - * This is important for filesystems which use unnamed block devices. - * - * We now support a flag for forced unmount like the other 'big iron' - * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD - */ - -int ksys_umount(char __user *name, int flags) +static int path_umount(struct path *path, int flags) { - struct path path; struct mount *mnt; int retval; - int lookup_flags = LOOKUP_MOUNTPOINT; if (flags & ~(MNT_FORCE | MNT_DETACH | MNT_EXPIRE | UMOUNT_NOFOLLOW)) return -EINVAL; - if (!may_mount()) return -EPERM; - if (!(flags & UMOUNT_NOFOLLOW)) - lookup_flags |= LOOKUP_FOLLOW; - - retval = user_path_at(AT_FDCWD, name, lookup_flags, &path); - if (retval) - goto out; - mnt = real_mount(path.mnt); + mnt = real_mount(path->mnt); retval = -EINVAL; - if (path.dentry != path.mnt->mnt_root) + if (path->dentry != path->mnt->mnt_root) goto dput_and_out; if (!check_mnt(mnt)) goto dput_and_out; @@ -1748,12 +1731,25 @@ int ksys_umount(char __user *name, int flags) retval = do_umount(mnt, flags); dput_and_out: /* we mustn't call path_put() as that would clear mnt_expiry_mark */ - dput(path.dentry); + dput(path->dentry); mntput_no_expire(mnt); -out: return retval; } +int ksys_umount(char __user *name, int flags) +{ + int lookup_flags = LOOKUP_MOUNTPOINT; + struct path path; + int ret; + + if (!(flags & UMOUNT_NOFOLLOW)) + lookup_flags |= LOOKUP_FOLLOW; + ret = user_path_at(AT_FDCWD, name, lookup_flags, &path); + if (ret) + return ret; + return path_umount(&path, flags); +} + SYSCALL_DEFINE2(umount, char __user *, name, int, flags) { return ksys_umount(name, flags); -- 2.27.0
next prev parent reply other threads:[~2020-07-26 7:13 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-26 7:13 add file system helpers that take kernel pointers for the init code v3 Christoph Hellwig 2020-07-26 7:13 ` Christoph Hellwig 2020-07-26 7:13 ` [PATCH 01/21] fs: refactor do_mount Christoph Hellwig 2020-07-26 7:13 ` [PATCH 03/21] fs: push the getname from do_rmdir into the callers Christoph Hellwig 2020-07-26 7:13 ` [PATCH 06/21] init: mark create_dev as __init Christoph Hellwig 2020-07-26 7:13 ` [PATCH 07/21] init: add an init_mount helper Christoph Hellwig [not found] ` <20200726071356.287160-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-26 7:13 ` Christoph Hellwig [this message] 2020-07-26 7:13 ` [PATCH 02/21] fs: refactor ksys_umount Christoph Hellwig 2020-07-26 7:13 ` [PATCH 04/21] devtmpfs: refactor devtmpfsd() Christoph Hellwig 2020-07-26 7:13 ` Christoph Hellwig [not found] ` <20200726071356.287160-5-hch-jcswGhMUV9g@public.gmane.org> 2020-07-26 7:43 ` Greg Kroah-Hartman 2020-07-26 7:43 ` Greg Kroah-Hartman 2020-07-26 8:21 ` Christoph Hellwig 2020-07-26 7:13 ` [PATCH 05/21] init: initialize ramdisk_execute_command at compile time Christoph Hellwig 2020-07-26 7:13 ` Christoph Hellwig 2020-07-26 7:13 ` [PATCH 08/21] init: add an init_umount helper Christoph Hellwig 2020-07-26 7:13 ` Christoph Hellwig 2020-07-26 7:13 ` [PATCH 09/21] init: add an init_unlink helper Christoph Hellwig 2020-07-26 7:13 ` Christoph Hellwig 2020-07-26 7:13 ` [PATCH 10/21] init: add an init_rmdir helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 11/21] init: add an init_chdir helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 12/21] init: add an init_chroot helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 13/21] init: add an init_chown helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 14/21] init: add an init_chmod helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 15/21] init: add an init_eaccess helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 16/21] init: add an init_link helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 17/21] init: add an init_symlink helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 18/21] init: add an init_mkdir helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 19/21] init: add an init_mknod helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 20/21] init: add an init_stat helper Christoph Hellwig 2020-07-26 7:13 ` [PATCH 21/21] init: add an init_utimes helper Christoph Hellwig 2020-07-26 15:49 ` add file system helpers that take kernel pointers for the init code v3 Linus Torvalds [not found] ` <CAHk-=wgq8evViJD9Hnjugq=V0eUAn7K6ZjOP7P7qki-nOTx_jg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2020-07-26 15:52 ` Christoph Hellwig 2020-07-26 15:52 ` Christoph Hellwig 2020-07-26 16:21 ` Al Viro [not found] ` <20200726162113.GR2786714-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> 2020-07-26 16:24 ` Christoph Hellwig 2020-07-26 16:24 ` Christoph Hellwig [not found] ` <20200726162426.GA24479-jcswGhMUV9g@public.gmane.org> 2020-07-26 16:26 ` Christoph Hellwig 2020-07-26 16:26 ` Christoph Hellwig [not found] ` <20200726162627.GA24522-jcswGhMUV9g@public.gmane.org> 2020-07-26 16:33 ` Al Viro 2020-07-26 16:33 ` Al Viro
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=20200726071356.287160-3-hch@lst.de \ --to=hch-jcswghmuv9g@public.gmane.org \ --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \ --cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \ --cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org \ /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.