init_mknod(): turn into a trivial wrapper for do_mknodat()

Same as init_unlink() and init_rmdir() already are; the only obstacle
is do_mknodat() being static.

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

diff --git a/fs/init.c b/fs/init.c
index e0f5429c0a49d046bd3f231a260954ed0f90ef44..746d02628bc3bce2d77e72109737307692458e5e 100644 (file)
--- a/fs/init.c
+++ b/fs/init.c
@@ -140,26 +140,7 @@ 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)
 {
-       struct dentry *dentry;
-       struct path path;
-       int error;
-
-       if (S_ISFIFO(mode) || S_ISSOCK(mode))
-               dev = 0;
-       else if (!(S_ISBLK(mode) || S_ISCHR(mode)))
-               return -EINVAL;
-
-       dentry = start_creating_path(AT_FDCWD, filename, &path, 0);
-       if (IS_ERR(dentry))
-               return PTR_ERR(dentry);
-
-       mode = mode_strip_umask(d_inode(path.dentry), mode);
-       error = security_path_mknod(&path, dentry, mode, dev);
-       if (!error)
-               error = vfs_mknod(mnt_idmap(path.mnt), path.dentry->d_inode,
-                                 dentry, mode, new_decode_dev(dev), NULL);
-       end_creating_path(&path, dentry);
-       return error;
+       return do_mknodat(AT_FDCWD, getname_kernel(filename), mode, dev);
 }
 
 int __init init_link(const char *oldname, const char *newname)

diff --git a/fs/internal.h b/fs/internal.h
index ab638d41ab81db8de33a895defd6e3538a170223..7267aa0926a156c04e737abe41a3b68d20eb8ce0 100644 (file)
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -60,6 +60,7 @@ int may_linkat(struct mnt_idmap *idmap, const struct path *link);
 int do_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 do_mknodat(int dfd, struct filename *name, umode_t mode, unsigned int dev);
 int do_symlinkat(struct filename *from, int newdfd, struct filename *to);
 int do_linkat(int olddfd, struct filename *old, int newdfd,
                        struct filename *new, int flags);

diff --git a/fs/namei.c b/fs/namei.c
index cf16b6822dd311fca3b059f2bfb5f18bfead6f33..4595b355b3cebb8b0c38ec1c3be7ccce904a6745 100644 (file)
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -5018,7 +5018,7 @@ static int may_mknod(umode_t mode)
        }
 }
 
-static int do_mknodat(int dfd, struct filename *name, umode_t mode,
+int do_mknodat(int dfd, struct filename *name, umode_t mode,
                unsigned int dev)
 {
        struct delegated_inode di = { };