linux-raid.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 11/23] init: add an init_rmdir helper
Date: Tue, 28 Jul 2020 18:34:04 +0200	[thread overview]
Message-ID: <20200728163416.556521-12-hch@lst.de> (raw)
In-Reply-To: <20200728163416.556521-1-hch@lst.de>

Add a simple helper to rmdir with a kernel space file name and switch
the early init code over to it.  Remove the now unused ksys_rmdir.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/init.c                     | 5 +++++
 include/linux/init_syscalls.h | 1 +
 include/linux/syscalls.h      | 7 -------
 init/initramfs.c              | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/fs/init.c b/fs/init.c
index 507ffbb5d146d6..eabd9ed2b51092 100644
--- a/fs/init.c
+++ b/fs/init.c
@@ -42,3 +42,8 @@ int __init init_unlink(const char *pathname)
 {
 	return do_unlinkat(AT_FDCWD, getname_kernel(pathname));
 }
+
+int __init init_rmdir(const char *pathname)
+{
+	return do_rmdir(AT_FDCWD, getname_kernel(pathname));
+}
diff --git a/include/linux/init_syscalls.h b/include/linux/init_syscalls.h
index 00d597249549ee..abf3af563c0b3a 100644
--- a/include/linux/init_syscalls.h
+++ b/include/linux/init_syscalls.h
@@ -4,3 +4,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);
+int __init init_rmdir(const char *pathname);
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 26f9738e5ab861..a7b14258d245e2 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.
  */
-long do_rmdir(int dfd, struct filename *name);
-
-static inline long ksys_rmdir(const char __user *pathname)
-{
-	return do_rmdir(AT_FDCWD, getname(pathname));
-}
-
 extern long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);
 
 static inline long ksys_mkdir(const char __user *pathname, umode_t mode)
diff --git a/init/initramfs.c b/init/initramfs.c
index 7e9db1cfa3c060..fb7210731d9e5d 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -300,7 +300,7 @@ static void __init clean_path(char *path, umode_t fmode)
 
 	if (!vfs_lstat(path, &st) && (st.mode ^ fmode) & S_IFMT) {
 		if (S_ISDIR(st.mode))
-			ksys_rmdir(path);
+			init_rmdir(path);
 		else
 			init_unlink(path);
 	}
-- 
2.27.0

  parent reply	other threads:[~2020-07-28 16:34 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-28 16:33 add file system helpers that take kernel pointers for the init code v4 Christoph Hellwig
2020-07-28 16:33 ` [PATCH 01/23] fs: refactor do_mount Christoph Hellwig
2020-07-28 16:33 ` [PATCH 02/23] fs: refactor ksys_umount Christoph Hellwig
     [not found]   ` <20200728163416.556521-3-hch-jcswGhMUV9g@public.gmane.org>
2020-08-06 14:44     ` Naresh Kamboju
2020-08-17 13:44       ` Naresh Kamboju
2020-07-28 16:33 ` [PATCH 03/23] fs: push the getname from do_rmdir into the callers Christoph Hellwig
2020-07-28 16:33 ` [PATCH 05/23] init: initialize ramdisk_execute_command at compile time Christoph Hellwig
2020-07-28 16:34 ` [PATCH 08/23] init: add an init_mount helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 09/23] init: add an init_umount helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 10/23] init: add an init_unlink helper Christoph Hellwig
2020-07-28 16:34 ` Christoph Hellwig [this message]
2020-07-28 16:34 ` [PATCH 12/23] init: add an init_chdir helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 13/23] init: add an init_chroot helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 14/23] init: add an init_chown helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 15/23] init: add an init_chmod helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 16/23] init: add an init_eaccess helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 17/23] init: add an init_link helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 18/23] init: add an init_symlink helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 19/23] init: add an init_mkdir helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 20/23] init: add an init_mknod helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 21/23] init: add an init_stat helper Christoph Hellwig
2020-09-04 13:53   ` [PATCH] init: fix error check in clean_path() Barret Rhoden
2020-09-04 16:04     ` Christoph Hellwig
     [not found] ` <20200728163416.556521-1-hch-jcswGhMUV9g@public.gmane.org>
2020-07-28 16:33   ` [PATCH 04/23] devtmpfs: refactor devtmpfsd() Christoph Hellwig
2020-07-28 16:59     ` Greg Kroah-Hartman
2020-07-28 16:33   ` [PATCH 06/23] init: mark console_on_rootfs as __init Christoph Hellwig
2020-07-28 16:34   ` [PATCH 07/23] init: mark create_dev " Christoph Hellwig
2020-07-28 16:34   ` [PATCH 22/23] init: add an init_utimes helper Christoph Hellwig
2020-07-28 16:34 ` [PATCH 23/23] init: add an init_dup helper Christoph Hellwig
2020-07-29 19:51 ` add file system helpers that take kernel pointers for the init code v4 Al Viro
2020-07-30  6:25   ` Christoph Hellwig
2020-07-31  2:14     ` Al Viro
     [not found]       ` <20200731021424.GG1236603-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
2020-07-31  6:33         ` Christoph Hellwig
2020-08-03 14:56 ` Qian Cai
     [not found]   ` <20200803145622.GB4631-J5quhbR+WMc@public.gmane.org>
2020-08-03 15:08     ` Christoph Hellwig

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=20200728163416.556521-12-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).