namei: update do_*() helpers to return ints
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: Al Viro <viro@zeniv.linux.org.uk> Cc: Christian Brauner <christian.brauner@ubuntu.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> 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> Link: https://lore.kernel.org/r/20210708063447.3556403-9-dkadashev@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
020250f31c
commit
45f30dab39
|
@ -71,12 +71,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
|
||||
|
|
10
fs/namei.c
10
fs/namei.c
|
@ -3755,7 +3755,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;
|
||||
|
@ -3860,7 +3860,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;
|
||||
|
@ -3957,7 +3957,7 @@ out:
|
|||
}
|
||||
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;
|
||||
|
@ -4095,7 +4095,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;
|
||||
|
@ -4223,7 +4223,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;
|
||||
|
|
Loading…
Reference in New Issue