similar to previous commit; replacement is filename_mkdirat() Signed-off-by: Al Viro --- Documentation/filesystems/porting.rst | 2 +- fs/init.c | 3 ++- fs/internal.h | 2 +- fs/namei.c | 9 +++++---- io_uring/fs.c | 3 ++- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst index c44c351bc297..ace0607fe39c 100644 --- a/Documentation/filesystems/porting.rst +++ b/Documentation/filesystems/porting.rst @@ -1339,6 +1339,6 @@ in-tree filesystems have done). **mandatory** -do_{link,symlink,renameat2}() are gone; filename_...() counterparts +do_{mkdir,link,symlink,renameat2}() are gone; filename_...() counterparts replace those. The difference is that the former used to consume filename references; the latter do not. diff --git a/fs/init.c b/fs/init.c index a54ef750ffe3..9a550ba4802f 100644 --- a/fs/init.c +++ b/fs/init.c @@ -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) diff --git a/fs/internal.h b/fs/internal.h index 4a63b89c02d7..03638008d84a 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -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, diff --git a/fs/namei.c b/fs/namei.c index 338e2934c520..e3252d4abce4 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -5171,9 +5171,8 @@ struct dentry *vfs_mkdir(struct mnt_idmap *idmap, struct inode *dir, } 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) { - CLASS(filename_consume, name)(__name); struct dentry *dentry; struct path path; int error; @@ -5208,12 +5207,14 @@ int do_mkdirat(int dfd, struct filename *__name, umode_t mode) 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); } /** diff --git a/io_uring/fs.c b/io_uring/fs.c index cd4d88d37795..40541b539e0d 100644 --- a/io_uring/fs.c +++ b/io_uring/fs.c @@ -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); -- 2.47.3