summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-23 09:23:08 +0300
committerChristoph Hellwig <hch@lst.de>2020-07-31 09:17:51 +0300
commit09267defa36aaff6ff829bd2fc8b043ec151cc3e (patch)
tree112707b95369bc1db23f2b60c2f286135d7b69fe /fs
parentc60166f04283ffba7b88b45d824bbfb2bfccee24 (diff)
downloadlinux-09267defa36aaff6ff829bd2fc8b043ec151cc3e.tar.xz
init: add an init_umount helper
Like ksys_umount, but takes a kernel pointer for the destination path. Switch over the umount in the init code, which just happen to work due to the implicit set_fs(KERNEL_DS) during early init right now. Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/init.c14
-rw-r--r--fs/internal.h1
-rw-r--r--fs/namespace.c4
3 files changed, 17 insertions, 2 deletions
diff --git a/fs/init.c b/fs/init.c
index c6eb724e1c7b..9c8e31fdb048 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -23,3 +23,17 @@ int __init init_mount(const char *dev_name, const char *dir_name,
path_put(&path);
return ret;
}
+
+int __init init_umount(const char *name, int flags)
+{
+ int lookup_flags = LOOKUP_MOUNTPOINT;
+ struct path path;
+ int ret;
+
+ if (!(flags & UMOUNT_NOFOLLOW))
+ lookup_flags |= LOOKUP_FOLLOW;
+ ret = kern_path(name, lookup_flags, &path);
+ if (ret)
+ return ret;
+ return path_umount(&path, flags);
+}
diff --git a/fs/internal.h b/fs/internal.h
index 72ea0b6f7435..491d1e63809b 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -92,6 +92,7 @@ extern void dissolve_on_fput(struct vfsmount *);
int path_mount(const char *dev_name, struct path *path,
const char *type_page, unsigned long flags, void *data_page);
+int path_umount(struct path *path, int flags);
/*
* fs_struct.c
diff --git a/fs/namespace.c b/fs/namespace.c
index 2c4d75920974..a7301790abb2 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1706,7 +1706,7 @@ static inline bool may_mandlock(void)
}
#endif
-static int path_umount(struct path *path, int flags)
+int path_umount(struct path *path, int flags)
{
struct mount *mnt;
int retval;
@@ -1736,7 +1736,7 @@ dput_and_out:
return retval;
}
-int ksys_umount(char __user *name, int flags)
+static int ksys_umount(char __user *name, int flags)
{
int lookup_flags = LOOKUP_MOUNTPOINT;
struct path path;