All of lore.kernel.org
 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 03/21] fs: push the getname from do_rmdir into the callers
Date: Sun, 26 Jul 2020 09:13:38 +0200	[thread overview]
Message-ID: <20200726071356.287160-4-hch@lst.de> (raw)
In-Reply-To: <20200726071356.287160-1-hch@lst.de>

This mirrors do_unlinkat and will make life a little easier for
the init code to reuse the whole function with a kernel filename.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/internal.h            |  2 +-
 fs/namei.c               | 10 ++++------
 include/linux/syscalls.h |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/fs/internal.h b/fs/internal.h
index 9b863a7bd70892..e903d5aae139a2 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -65,7 +65,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
 long do_mknodat(int dfd, const char __user *filename, umode_t mode,
 		unsigned int dev);
 long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);
-long do_rmdir(int dfd, const char __user *pathname);
+long do_rmdir(int dfd, struct filename *name);
 long do_unlinkat(int dfd, struct filename *name);
 long do_symlinkat(const char __user *oldname, int newdfd,
 		  const char __user *newname);
diff --git a/fs/namei.c b/fs/namei.c
index 72d4219c93acb7..d75a6039ae3966 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3720,17 +3720,16 @@ int vfs_rmdir(struct inode *dir, struct dentry *dentry)
 }
 EXPORT_SYMBOL(vfs_rmdir);
 
-long do_rmdir(int dfd, const char __user *pathname)
+long do_rmdir(int dfd, struct filename *name)
 {
 	int error = 0;
-	struct filename *name;
 	struct dentry *dentry;
 	struct path path;
 	struct qstr last;
 	int type;
 	unsigned int lookup_flags = 0;
 retry:
-	name = filename_parentat(dfd, getname(pathname), lookup_flags,
+	name = filename_parentat(dfd, name, lookup_flags,
 				&path, &last, &type);
 	if (IS_ERR(name))
 		return PTR_ERR(name);
@@ -3781,7 +3780,7 @@ long do_rmdir(int dfd, const char __user *pathname)
 
 SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
 {
-	return do_rmdir(AT_FDCWD, pathname);
+	return do_rmdir(AT_FDCWD, getname(pathname));
 }
 
 /**
@@ -3926,8 +3925,7 @@ SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
 		return -EINVAL;
 
 	if (flag & AT_REMOVEDIR)
-		return do_rmdir(dfd, pathname);
-
+		return do_rmdir(dfd, getname(pathname));
 	return do_unlinkat(dfd, getname(pathname));
 }
 
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 5b0f1fca4cfb9d..e43816198e6001 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1281,11 +1281,11 @@ static inline long ksys_unlink(const char __user *pathname)
 	return do_unlinkat(AT_FDCWD, getname(pathname));
 }
 
-extern long do_rmdir(int dfd, const char __user *pathname);
+long do_rmdir(int dfd, struct filename *name);
 
 static inline long ksys_rmdir(const char __user *pathname)
 {
-	return do_rmdir(AT_FDCWD, pathname);
+	return do_rmdir(AT_FDCWD, getname(pathname));
 }
 
 extern long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);
-- 
2.27.0

  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 ` Christoph Hellwig [this message]
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   ` [PATCH 02/21] fs: refactor ksys_umount Christoph Hellwig
2020-07-26  7:13     ` 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-4-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 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.