Skip to content

Commit

Permalink
rpc_pipe: convert back to simple_dir_inode_operations
Browse files Browse the repository at this point in the history
Now that Al has fixed simple_lookup to account for the case where
sb->s_d_op is set, there's no need to keep our own special lookup op.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  • Loading branch information
Jeff Layton authored and Trond Myklebust committed Jul 23, 2013
1 parent cc7936f commit 275448e
Showing 1 changed file with 1 addition and 18 deletions.
19 changes: 1 addition & 18 deletions net/sunrpc/rpc_pipe.c
Original file line number Diff line number Diff line change
Expand Up @@ -480,23 +480,6 @@ static const struct dentry_operations rpc_dentry_operations = {
.d_delete = rpc_delete_dentry,
};

/*
* Lookup the data. This is trivial - if the dentry didn't already
* exist, we know it is negative.
*/
static struct dentry *
rpc_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
{
if (dentry->d_name.len > NAME_MAX)
return ERR_PTR(-ENAMETOOLONG);
d_add(dentry, NULL);
return NULL;
}

static const struct inode_operations rpc_dir_inode_operations = {
.lookup = rpc_lookup,
};

static struct inode *
rpc_get_inode(struct super_block *sb, umode_t mode)
{
Expand All @@ -509,7 +492,7 @@ rpc_get_inode(struct super_block *sb, umode_t mode)
switch (mode & S_IFMT) {
case S_IFDIR:
inode->i_fop = &simple_dir_operations;
inode->i_op = &rpc_dir_inode_operations;
inode->i_op = &simple_dir_inode_operations;
inc_nlink(inode);
default:
break;
Expand Down

0 comments on commit 275448e

Please sign in to comment.