non-consuming variant of do_mknodat()

similar to previous commit; replacement is filename_mknodat()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/Documentation/filesystems/porting.rst b/Documentation/filesystems/porting.rst
index d75b549ed528d137ce8ba90e61faf6c5051af0f3..d9a94a071852429a2c9fd35cc74a18355242d5d2 100644 (file)
--- a/Documentation/filesystems/porting.rst
+++ b/Documentation/filesystems/porting.rst
@@ -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_mkdirat().
+do_symlinkat(), do_mkdirat(), do_mknodat().

diff --git a/fs/init.c b/fs/init.c
index 9a550ba4802f657744cf4396fd3877c0447683a0..543444c1d79e12252d4f1b14e4f47fabd504c70e 100644 (file)
--- a/fs/init.c
+++ b/fs/init.c
@@ -140,7 +140,8 @@ int __init init_stat(const char *filename, struct kstat *stat, int flags)
 
 int __init init_mknod(const char *filename, umode_t mode, unsigned int dev)
 {
-       return do_mknodat(AT_FDCWD, getname_kernel(filename), mode, dev);
+       CLASS(filename_kernel, name)(filename);
+       return filename_mknodat(AT_FDCWD, name, mode, dev);
 }
 
 int __init init_link(const char *oldname, const char *newname)

diff --git a/fs/internal.h b/fs/internal.h
index 03638008d84a83257007cc58d5754ab91a98aa59..02b5dec13ff3667d214eb9fe70d934ad9153c615 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -60,7 +60,7 @@ 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 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_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,
                        struct filename *new, int flags);

diff --git a/fs/namei.c b/fs/namei.c
index 21a2dbd8b9e66e3f5c99155522c993859ab77ded..ca524c5b18f41e2d1a475dd5691b3872e8aa2fd2 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -5072,8 +5072,8 @@ static int may_mknod(umode_t mode)
        }
 }
 
-int do_mknodat(int dfd, struct filename *name, umode_t mode,
-               unsigned int dev)
+int filename_mknodat(int dfd, struct filename *name, umode_t mode,
+                    unsigned int dev)
 {
        struct delegated_inode di = { };
        struct mnt_idmap *idmap;
@@ -5084,12 +5084,11 @@ int do_mknodat(int dfd, struct filename *name, umode_t mode,
 
        error = may_mknod(mode);
        if (error)
-               goto out1;
+               return error;
 retry:
        dentry = filename_create(dfd, name, &path, lookup_flags);
-       error = PTR_ERR(dentry);
        if (IS_ERR(dentry))
-               goto out1;
+               return PTR_ERR(dentry);
 
        error = security_path_mknod(&path, dentry,
                        mode_strip_umask(path.dentry->d_inode, mode), dev);
@@ -5123,20 +5122,20 @@ out2:
                lookup_flags |= LOOKUP_REVAL;
                goto retry;
        }
-out1:
-       putname(name);
        return error;
 }
 
 SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
                unsigned int, dev)
 {
-       return do_mknodat(dfd, getname(filename), mode, dev);
+       CLASS(filename, name)(filename);
+       return filename_mknodat(dfd, name, mode, dev);
 }
 
 SYSCALL_DEFINE3(mknod, const char __user *, filename, umode_t, mode, unsigned, dev)
 {
-       return do_mknodat(AT_FDCWD, getname(filename), mode, dev);
+       CLASS(filename, name)(filename);
+       return filename_mknodat(AT_FDCWD, name, mode, dev);
 }
 
 /**