Skip to content

Commit

Permalink
debugfs_mknod(): get rid useless arguments
Browse files Browse the repository at this point in the history
dev is always zero, dir was only used to get its ->i_sb, which is
equal to ->d_sb of dentry...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 25, 2015
1 parent 9b73fab commit 160f759
Showing 1 changed file with 11 additions and 17 deletions.
28 changes: 11 additions & 17 deletions fs/debugfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,18 @@ static struct inode *debugfs_get_inode(struct super_block *sb, umode_t mode, dev
}

/* SMP-safe */
static int debugfs_mknod(struct inode *dir, struct dentry *dentry,
umode_t mode, dev_t dev, void *data,
static int debugfs_mknod(struct dentry *dentry,
umode_t mode, void *data,
const struct file_operations *fops)
{
struct inode *inode;
int error = -EPERM;

if (dentry->d_inode)
return -EEXIST;

inode = debugfs_get_inode(dir->i_sb, mode, dev, data, fops);
if (inode) {
d_instantiate(dentry, inode);
dget(dentry);
error = 0;
}
return error;
inode = debugfs_get_inode(dentry->d_sb, mode, 0, data, fops);
if (unlikely(!inode))
return -EPERM;
d_instantiate(dentry, inode);
dget(dentry);
return 0;
}

static int debugfs_mkdir(struct dentry *dentry, umode_t mode)
Expand All @@ -95,7 +90,7 @@ static int debugfs_mkdir(struct dentry *dentry, umode_t mode)
int res;

mode = (mode & (S_IRWXUGO | S_ISVTX)) | S_IFDIR;
res = debugfs_mknod(dir, dentry, mode, 0, NULL, NULL);
res = debugfs_mknod(dentry, mode, NULL, NULL);
if (!res) {
inc_nlink(dir);
fsnotify_mkdir(dir, dentry);
Expand All @@ -110,7 +105,7 @@ static int debugfs_create(struct dentry *dentry, umode_t mode,
int res;

mode = (mode & S_IALLUGO) | S_IFREG;
res = debugfs_mknod(dir, dentry, mode, 0, data, fops);
res = debugfs_mknod(dentry, mode, data, fops);
if (!res)
fsnotify_create(dir, dentry);
return res;
Expand Down Expand Up @@ -458,8 +453,7 @@ struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
return NULL;
}

error = debugfs_mknod(dentry->d_parent->d_inode, dentry,
S_IFLNK | S_IRWXUGO, 0, link, NULL);
error = debugfs_mknod(dentry, S_IFLNK | S_IRWXUGO, link, NULL);
if (error)
kfree(link);

Expand Down

0 comments on commit 160f759

Please sign in to comment.