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 09/21] init: add an init_unlink helper
Date: Sun, 26 Jul 2020 09:13:44 +0200 [thread overview]
Message-ID: <20200726071356.287160-10-hch@lst.de> (raw)
In-Reply-To: <20200726071356.287160-1-hch@lst.de>
Add a simple helper to unlink with a kernel space file name and switch
the early init code over to it. Remove the now unused ksys_unlink.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/for_init.c | 5 +++++
include/linux/init_syscalls.h | 1 +
include/linux/syscalls.h | 7 -------
init/do_mounts.h | 2 +-
init/do_mounts_initrd.c | 4 ++--
init/do_mounts_rd.c | 2 +-
init/initramfs.c | 3 ++-
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/fs/for_init.c b/fs/for_init.c
index 7a039b6d107c92..32472206d64136 100644
--- a/fs/for_init.c
+++ b/fs/for_init.c
@@ -33,3 +33,8 @@ int __init init_umount(const char *name, int flags)
return ret;
return path_umount(&path, flags);
}
+
+int __init init_unlink(const char *pathname)
+{
+ return do_unlinkat(AT_FDCWD, getname_kernel(pathname));
+}
diff --git a/include/linux/init_syscalls.h b/include/linux/init_syscalls.h
index a5a2e7f1991691..00d597249549ee 100644
--- a/include/linux/init_syscalls.h
+++ b/include/linux/init_syscalls.h
@@ -3,3 +3,4 @@
int __init init_mount(const char *dev_name, const char *dir_name,
const char *type_page, unsigned long flags, void *data_page);
int __init init_umount(const char *name, int flags);
+int __init init_unlink(const char *pathname);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 1a4f5d8ee7044b..26f9738e5ab861 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1273,13 +1273,6 @@ int compat_ksys_ipc(u32 call, int first, int second,
* The following kernel syscall equivalents are just wrappers to fs-internal
* functions. Therefore, provide stubs to be inlined at the callsites.
*/
-extern long do_unlinkat(int dfd, struct filename *name);
-
-static inline long ksys_unlink(const char __user *pathname)
-{
- return do_unlinkat(AT_FDCWD, getname(pathname));
-}
-
long do_rmdir(int dfd, struct filename *name);
static inline long ksys_rmdir(const char __user *pathname)
diff --git a/init/do_mounts.h b/init/do_mounts.h
index 20e7fec8cb499e..104d8431725aeb 100644
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -16,7 +16,7 @@ extern int root_mountflags;
static inline __init int create_dev(char *name, dev_t dev)
{
- ksys_unlink(name);
+ init_unlink(name);
return ksys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
}
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 6b020a06990251..8b44dd017842a8 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -137,11 +137,11 @@ bool __init initrd_load(void)
* mounted in the normal path.
*/
if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
- ksys_unlink("/initrd.image");
+ init_unlink("/initrd.image");
handle_initrd();
return true;
}
}
- ksys_unlink("/initrd.image");
+ init_unlink("/initrd.image");
return false;
}
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 7b64390c075043..b062f8b028ce7c 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -271,7 +271,7 @@ int __init rd_load_image(char *from)
fput(out_file);
out:
kfree(buf);
- ksys_unlink("/dev/ram");
+ init_unlink("/dev/ram");
return res;
}
diff --git a/init/initramfs.c b/init/initramfs.c
index 3823d15e5d2619..574ab3755203da 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -12,6 +12,7 @@
#include <linux/file.h>
#include <linux/memblock.h>
#include <linux/namei.h>
+#include <linux/init_syscalls.h>
static ssize_t __init xwrite(struct file *file, const char *p, size_t count)
{
@@ -300,7 +301,7 @@ static void __init clean_path(char *path, umode_t fmode)
if (S_ISDIR(st.mode))
ksys_rmdir(path);
else
- ksys_unlink(path);
+ init_unlink(path);
}
}
--
2.27.0
next prev parent reply other threads:[~2020-07-26 7:14 UTC|newest]
Thread overview: 30+ 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 ` [PATCH 01/21] fs: refactor do_mount Christoph Hellwig
2020-07-26 7:13 ` [PATCH 02/21] fs: refactor ksys_umount 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 04/21] devtmpfs: refactor devtmpfsd() Christoph Hellwig
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 ` [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
2020-07-26 7:13 ` [PATCH 08/21] init: add an init_umount helper Christoph Hellwig
2020-07-26 7:13 ` Christoph Hellwig [this message]
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
2020-07-26 15:52 ` Christoph Hellwig
2020-07-26 16:21 ` Al Viro
2020-07-26 16:24 ` Christoph Hellwig
2020-07-26 16:26 ` Christoph Hellwig
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-10-hch@lst.de \
--to=hch@lst.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).