From: Dmitry Kadashev <dkadashev@gmail.com>
To: Jens Axboe <axboe@kernel.dk>,
Alexander Viro <viro@zeniv.linux.org.uk>,
Christian Brauner <christian.brauner@ubuntu.com>,
Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pavel Begunkov <asml.silence@gmail.com>,
linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org,
Dmitry Kadashev <dkadashev@gmail.com>
Subject: [PATCH v9 08/11] namei: update do_*() helpers to return ints
Date: Thu, 8 Jul 2021 13:34:44 +0700 [thread overview]
Message-ID: <20210708063447.3556403-9-dkadashev@gmail.com> (raw)
In-Reply-To: <20210708063447.3556403-1-dkadashev@gmail.com>
Update the following to return int rather than long, for uniformity with
the rest of the do_* helpers in namei.c:
* do_rmdir()
* do_unlinkat()
* do_mkdirat()
* do_mknodat()
* do_symlinkat()
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/io-uring/20210514143202.dmzfcgz5hnauy7ze@wittgenstein/
Signed-off-by: Dmitry Kadashev <dkadashev@gmail.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
---
fs/internal.h | 6 +++---
fs/namei.c | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/internal.h b/fs/internal.h
index 848e165ef0f1..207a455e32d3 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -72,12 +72,12 @@ extern int filename_lookup(int dfd, struct filename *name, unsigned flags,
struct path *path, struct path *root);
extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
const char *, unsigned int, struct path *);
-long do_rmdir(int dfd, struct filename *name);
-long do_unlinkat(int dfd, struct filename *name);
+int do_rmdir(int dfd, struct filename *name);
+int do_unlinkat(int dfd, struct filename *name);
int may_linkat(struct user_namespace *mnt_userns, struct path *link);
int do_renameat2(int olddfd, struct filename *oldname, int newdfd,
struct filename *newname, unsigned int flags);
-long do_mkdirat(int dfd, struct filename *name, umode_t mode);
+int do_mkdirat(int dfd, struct filename *name, umode_t mode);
/*
* namespace.c
diff --git a/fs/namei.c b/fs/namei.c
index c4e13bd8652f..d06aeaf5da00 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3745,7 +3745,7 @@ static int may_mknod(umode_t mode)
}
}
-static long do_mknodat(int dfd, struct filename *name, umode_t mode,
+static int do_mknodat(int dfd, struct filename *name, umode_t mode,
unsigned int dev)
{
struct user_namespace *mnt_userns;
@@ -3850,7 +3850,7 @@ int vfs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,
}
EXPORT_SYMBOL(vfs_mkdir);
-long do_mkdirat(int dfd, struct filename *name, umode_t mode)
+int do_mkdirat(int dfd, struct filename *name, umode_t mode)
{
struct dentry *dentry;
struct path path;
@@ -3947,7 +3947,7 @@ int vfs_rmdir(struct user_namespace *mnt_userns, struct inode *dir,
}
EXPORT_SYMBOL(vfs_rmdir);
-long do_rmdir(int dfd, struct filename *name)
+int do_rmdir(int dfd, struct filename *name)
{
struct user_namespace *mnt_userns;
int error;
@@ -4085,7 +4085,7 @@ EXPORT_SYMBOL(vfs_unlink);
* writeout happening, and we don't want to prevent access to the directory
* while waiting on the I/O.
*/
-long do_unlinkat(int dfd, struct filename *name)
+int do_unlinkat(int dfd, struct filename *name)
{
int error;
struct dentry *dentry;
@@ -4213,7 +4213,7 @@ int vfs_symlink(struct user_namespace *mnt_userns, struct inode *dir,
}
EXPORT_SYMBOL(vfs_symlink);
-static long do_symlinkat(struct filename *from, int newdfd,
+static int do_symlinkat(struct filename *from, int newdfd,
struct filename *to)
{
int error;
--
2.30.2
next prev parent reply other threads:[~2021-07-08 6:35 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 6:34 [PATCH v9 00/11] io_uring: add mkdir and [sym]linkat support Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 01/11] namei: ignore ERR/NULL names in putname() Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 02/11] namei: change filename_parentat() calling conventions Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 03/11] namei: make do_mkdirat() take struct filename Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 04/11] namei: make do_mknodat() " Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 05/11] namei: make do_symlinkat() " Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 06/11] namei: add getname_uflags() Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 07/11] namei: make do_linkat() take struct filename Dmitry Kadashev
2021-07-08 6:34 ` Dmitry Kadashev [this message]
2021-07-08 6:34 ` [PATCH v9 09/11] io_uring: add support for IORING_OP_MKDIRAT Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 10/11] io_uring: add support for IORING_OP_SYMLINKAT Dmitry Kadashev
2021-07-08 6:34 ` [PATCH v9 11/11] io_uring: add support for IORING_OP_LINKAT Dmitry Kadashev
2021-07-08 18:34 ` [PATCH v9 00/11] io_uring: add mkdir and [sym]linkat support Linus Torvalds
2021-07-08 19:25 ` Jens Axboe
2021-08-13 9:32 ` Dmitry Kadashev
2021-08-13 14:12 ` Jens Axboe
2021-08-16 10:24 ` Dmitry Kadashev
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=20210708063447.3556403-9-dkadashev@gmail.com \
--to=dkadashev@gmail.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=christian.brauner@ubuntu.com \
--cc=io-uring@vger.kernel.org \
--cc=linux-fsdevel@vger.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).