diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-07-14 09:55:39 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-07-14 09:55:39 -0400 |
commit | dae3794fd603b92dcbac2859fe0bc7fe129a5188 (patch) | |
tree | cb6f142aeb4089e23e85fd9732d628b82ae5f667 /net/sunrpc | |
parent | 786e1448d9c5d2a469bcc9d2aecacd418ee1aca0 (diff) |
sunrpc: now we can just set ->s_d_op
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/sunrpc')
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 27e54d265705..260fe72656a1 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -665,10 +665,8 @@ static struct dentry *__rpc_lookup_create_exclusive(struct dentry *parent, | |||
665 | if (!dentry) | 665 | if (!dentry) |
666 | return ERR_PTR(-ENOMEM); | 666 | return ERR_PTR(-ENOMEM); |
667 | } | 667 | } |
668 | if (dentry->d_inode == NULL) { | 668 | if (dentry->d_inode == NULL) |
669 | d_set_d_op(dentry, &rpc_dentry_operations); | ||
670 | return dentry; | 669 | return dentry; |
671 | } | ||
672 | dput(dentry); | 670 | dput(dentry); |
673 | return ERR_PTR(-EEXIST); | 671 | return ERR_PTR(-EEXIST); |
674 | } | 672 | } |
@@ -1102,6 +1100,7 @@ rpc_fill_super(struct super_block *sb, void *data, int silent) | |||
1102 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; | 1100 | sb->s_blocksize_bits = PAGE_CACHE_SHIFT; |
1103 | sb->s_magic = RPCAUTH_GSSMAGIC; | 1101 | sb->s_magic = RPCAUTH_GSSMAGIC; |
1104 | sb->s_op = &s_ops; | 1102 | sb->s_op = &s_ops; |
1103 | sb->s_d_op = &rpc_dentry_operations; | ||
1105 | sb->s_time_gran = 1; | 1104 | sb->s_time_gran = 1; |
1106 | 1105 | ||
1107 | inode = rpc_get_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); | 1106 | inode = rpc_get_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO); |