From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 13/24] init: add an init_unlink helper Date: Tue, 21 Jul 2020 18:28:07 +0200 Message-ID: <20200721162818.197315-14-hch@lst.de> References: <20200721162818.197315-1-hch@lst.de> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200721162818.197315-1-hch@lst.de> Sender: linux-fsdevel-owner@vger.kernel.org To: Al Viro , Linus Torvalds Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org List-Id: linux-raid.ids 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 --- include/linux/syscalls.h | 7 ------- init/do_mounts.h | 3 ++- init/do_mounts_initrd.c | 4 ++-- init/do_mounts_rd.c | 2 +- init/fs.c | 6 ++++++ init/initramfs.c | 3 ++- 6 files changed, 13 insertions(+), 12 deletions(-) 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 ce4f95fff6bc16..d2f1f335b5b5b9 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -11,6 +11,7 @@ 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_unlink(const char *pathname); void mount_block_root(char *name, int flags); void mount_root(void); @@ -19,7 +20,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 63a3eebd36e76b..dd4680c8ac762e 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -141,11 +141,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/fs.c b/init/fs.c index 73423f5461f934..1bdb5dc5ec12ba 100644 --- a/init/fs.c +++ b/init/fs.c @@ -3,6 +3,7 @@ #include #include #include +#include <../fs/internal.h> #include "do_mounts.h" int __init init_mount(const char *dev_name, const char *dir_name, @@ -18,3 +19,8 @@ int __init init_mount(const char *dev_name, const char *dir_name, path_put(&path); return ret; } + +int __init init_unlink(const char *pathname) +{ + return do_unlinkat(AT_FDCWD, getname_kernel(pathname)); +} diff --git a/init/initramfs.c b/init/initramfs.c index 6135b55286fc35..664be397c6b41e 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -12,6 +12,7 @@ #include #include #include +#include "do_mounts.h" static ssize_t __init xwrite(struct file *file, const char *p, size_t count) { @@ -307,7 +308,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