mirror of
https://github.com/torvalds/linux.git
synced 2026-03-08 03:44:45 +01:00
non-consuming variant of do_mkdirat()
similar to previous commit; replacement is filename_mkdirat() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
da72b76aae
commit
dc912db15a
5 changed files with 12 additions and 11 deletions
|
|
@ -1343,4 +1343,4 @@ fs/namei.c primitives that consume filesystem references (do_renameat2(),
|
|||
do_linkat(), do_symlinkat(), do_mkdirat(), do_mknodat(), do_unlinkat()
|
||||
and do_rmdir()) are getting replaced with non-consuming analogues
|
||||
(filename_renameat2(), etc.) Replaced so far: do_renameat2(), do_linkat(),
|
||||
do_symlinkat().
|
||||
do_symlinkat(), do_mkdirat().
|
||||
|
|
|
|||
|
|
@ -164,7 +164,8 @@ int __init init_unlink(const char *pathname)
|
|||
|
||||
int __init init_mkdir(const char *pathname, umode_t mode)
|
||||
{
|
||||
return do_mkdirat(AT_FDCWD, getname_kernel(pathname), mode);
|
||||
CLASS(filename_kernel, name)(pathname);
|
||||
return filename_mkdirat(AT_FDCWD, name, mode);
|
||||
}
|
||||
|
||||
int __init init_rmdir(const char *pathname)
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ int do_unlinkat(int dfd, struct filename *name);
|
|||
int may_linkat(struct mnt_idmap *idmap, const struct path *link);
|
||||
int filename_renameat2(int olddfd, struct filename *oldname, int newdfd,
|
||||
struct filename *newname, unsigned int flags);
|
||||
int do_mkdirat(int dfd, struct filename *name, umode_t mode);
|
||||
int filename_mkdirat(int dfd, struct filename *name, umode_t mode);
|
||||
int do_mknodat(int dfd, struct filename *name, umode_t mode, unsigned int dev);
|
||||
int filename_symlinkat(struct filename *from, int newdfd, struct filename *to);
|
||||
int filename_linkat(int olddfd, struct filename *old, int newdfd,
|
||||
|
|
|
|||
13
fs/namei.c
13
fs/namei.c
|
|
@ -5207,7 +5207,7 @@ err:
|
|||
}
|
||||
EXPORT_SYMBOL(vfs_mkdir);
|
||||
|
||||
int do_mkdirat(int dfd, struct filename *name, umode_t mode)
|
||||
int filename_mkdirat(int dfd, struct filename *name, umode_t mode)
|
||||
{
|
||||
struct dentry *dentry;
|
||||
struct path path;
|
||||
|
|
@ -5217,9 +5217,8 @@ int do_mkdirat(int dfd, struct filename *name, umode_t mode)
|
|||
|
||||
retry:
|
||||
dentry = filename_create(dfd, name, &path, lookup_flags);
|
||||
error = PTR_ERR(dentry);
|
||||
if (IS_ERR(dentry))
|
||||
goto out_putname;
|
||||
return PTR_ERR(dentry);
|
||||
|
||||
error = security_path_mkdir(&path, dentry,
|
||||
mode_strip_umask(path.dentry->d_inode, mode));
|
||||
|
|
@ -5239,19 +5238,19 @@ retry:
|
|||
lookup_flags |= LOOKUP_REVAL;
|
||||
goto retry;
|
||||
}
|
||||
out_putname:
|
||||
putname(name);
|
||||
return error;
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
|
||||
{
|
||||
return do_mkdirat(dfd, getname(pathname), mode);
|
||||
CLASS(filename, name)(pathname);
|
||||
return filename_mkdirat(dfd, name, mode);
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE2(mkdir, const char __user *, pathname, umode_t, mode)
|
||||
{
|
||||
return do_mkdirat(AT_FDCWD, getname(pathname), mode);
|
||||
CLASS(filename, name)(pathname);
|
||||
return filename_mkdirat(AT_FDCWD, name, mode);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -182,11 +182,12 @@ int io_mkdirat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
|
|||
int io_mkdirat(struct io_kiocb *req, unsigned int issue_flags)
|
||||
{
|
||||
struct io_mkdir *mkd = io_kiocb_to_cmd(req, struct io_mkdir);
|
||||
CLASS(filename_complete_delayed, name)(&mkd->filename);
|
||||
int ret;
|
||||
|
||||
WARN_ON_ONCE(issue_flags & IO_URING_F_NONBLOCK);
|
||||
|
||||
ret = do_mkdirat(mkd->dfd, complete_getname(&mkd->filename), mkd->mode);
|
||||
ret = filename_mkdirat(mkd->dfd, name, mkd->mode);
|
||||
|
||||
req->flags &= ~REQ_F_NEED_CLEANUP;
|
||||
io_req_set_res(req, ret, 0);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue