Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dae3794fd603b92dcbac2859fe0bc7fe129a5188

Authored by Al Viro
1 parent 786e1448d9
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

sunrpc: now we can just set ->s_d_op 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Showing 1 changed file with 2 additions and 3 deletions Side-by-side Diff

net/sunrpc/rpc_pipe.c
Diff comments   View file @ dae3794
... ... @@ -665,10 +665,8 @@
665 665 if (!dentry)
666 666 return ERR_PTR(-ENOMEM);
667 667 }
668   - if (dentry->d_inode == NULL) {
669   - d_set_d_op(dentry, &rpc_dentry_operations);
  668 + if (dentry->d_inode == NULL)
670 669 return dentry;
671   - }
672 670 dput(dentry);
673 671 return ERR_PTR(-EEXIST);
674 672 }
... ... @@ -1102,6 +1100,7 @@
1102 1100 sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
1103 1101 sb->s_magic = RPCAUTH_GSSMAGIC;
1104 1102 sb->s_op = &s_ops;
  1103 + sb->s_d_op = &rpc_dentry_operations;
1105 1104 sb->s_time_gran = 1;
1106 1105  
1107 1106 inode = rpc_get_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO);