mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-15 03:53:12 -05:00
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>
This commit is contained in:
21
fs/init.c
21
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)
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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 = { };
|
||||
|
||||
Reference in New Issue
Block a user