提交 d6689e5f 编写于 作者: A Al Viro

kill ll_mknod_generic()

just fold into ll_mknod()
Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
上级 e22fdcc8
...@@ -819,14 +819,14 @@ static int ll_new_node(struct inode *dir, struct qstr *name, ...@@ -819,14 +819,14 @@ static int ll_new_node(struct inode *dir, struct qstr *name,
return err; return err;
} }
static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode, static int ll_mknod(struct inode *dir, struct dentry *dchild,
unsigned rdev, struct dentry *dchild) umode_t mode, dev_t rdev)
{ {
int err; int err;
CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s,dir=%lu/%u(%p) mode %o dev %x\n", CDEBUG(D_VFSTRACE, "VFS Op:name=%pd,dir=%lu/%u(%p) mode %o dev %x\n",
name->len, name->name, dir->i_ino, dir->i_generation, dir, dchild, dir->i_ino, dir->i_generation, dir,
mode, rdev); mode, old_encode_dev(rdev));
if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir))) if (!IS_POSIXACL(dir) || !exp_connect_umask(ll_i2mdexp(dir)))
mode &= ~current_umask(); mode &= ~current_umask();
...@@ -839,7 +839,8 @@ static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode, ...@@ -839,7 +839,8 @@ static int ll_mknod_generic(struct inode *dir, struct qstr *name, int mode,
case S_IFBLK: case S_IFBLK:
case S_IFIFO: case S_IFIFO:
case S_IFSOCK: case S_IFSOCK:
err = ll_new_node(dir, name, NULL, mode, rdev, dchild, err = ll_new_node(dir, &dchild->d_name, NULL, mode,
old_encode_dev(rdev), dchild,
LUSTRE_OPC_MKNOD); LUSTRE_OPC_MKNOD);
break; break;
case S_IFDIR: case S_IFDIR:
...@@ -868,7 +869,7 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry, ...@@ -868,7 +869,7 @@ static int ll_create_nd(struct inode *dir, struct dentry *dentry,
dentry, dir->i_ino, dentry, dir->i_ino,
dir->i_generation, dir, mode, want_excl); dir->i_generation, dir, mode, want_excl);
rc = ll_mknod_generic(dir, &dentry->d_name, mode, 0, dentry); rc = ll_mknod(dir, dentry, mode, 0);
ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1); ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_CREATE, 1);
...@@ -1183,13 +1184,6 @@ static int ll_rename_generic(struct inode *src, struct dentry *src_dparent, ...@@ -1183,13 +1184,6 @@ static int ll_rename_generic(struct inode *src, struct dentry *src_dparent,
return err; return err;
} }
static int ll_mknod(struct inode *dir, struct dentry *dchild, ll_umode_t mode,
dev_t rdev)
{
return ll_mknod_generic(dir, &dchild->d_name, mode,
old_encode_dev(rdev), dchild);
}
static int ll_unlink(struct inode * dir, struct dentry *dentry) static int ll_unlink(struct inode * dir, struct dentry *dentry)
{ {
return ll_unlink_generic(dir, NULL, dentry, &dentry->d_name); return ll_unlink_generic(dir, NULL, dentry, &dentry->d_name);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册