Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8b244ff2fa58f81f84aa03c82c2c23307a778ce7

Authored by Al Viro
1 parent 96e1391414
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

switch nfs to ->s_d_op 

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

Showing 3 changed files with 1 additions and 10 deletions Side-by-side Diff

... ... @@ -439,7 +439,6 @@
439 439 if (dentry == NULL)
440 440 return;
441 441  
442   - d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
443 442 inode = nfs_fhget(dentry->d_sb, entry->fh, entry->fattr);
444 443 if (IS_ERR(inode))
445 444 goto out;
... ... @@ -1193,8 +1192,6 @@
1193 1192 if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
1194 1193 goto out;
1195 1194  
1196   - d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
1197   -
1198 1195 /*
1199 1196 * If we're doing an exclusive create, optimize away the lookup
1200 1197 * but don't hash the dentry.
... ... @@ -1338,7 +1335,6 @@
1338 1335 res = ERR_PTR(-ENAMETOOLONG);
1339 1336 goto out;
1340 1337 }
1341   - d_set_d_op(dentry, NFS_PROTO(dir)->dentry_ops);
1342 1338  
1343 1339 /* Let vfs_create() deal with O_EXCL. Instantiate, but don't hash
1344 1340 * the dentry. */
... ... @@ -119,9 +119,6 @@
119 119 }
120 120  
121 121 security_d_instantiate(ret, inode);
122   -
123   - if (ret->d_op == NULL)
124   - d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);
125 122 out:
126 123 nfs_free_fattr(fsinfo.fattr);
127 124 return ret;
... ... @@ -226,9 +223,6 @@
226 223 }
227 224  
228 225 security_d_instantiate(ret, inode);
229   -
230   - if (ret->d_op == NULL)
231   - d_set_d_op(ret, server->nfs_client->rpc_ops->dentry_ops);
232 226  
233 227 out:
234 228 nfs_free_fattr(fattr);
... ... @@ -2202,6 +2202,7 @@
2202 2202  
2203 2203 s->s_flags = sb_mntdata->mntflags;
2204 2204 s->s_fs_info = server;
  2205 + s->s_d_op = server->nfs_client->rpc_ops->dentry_ops;
2205 2206 ret = set_anon_super(s, server);
2206 2207 if (ret == 0)
2207 2208 server->s_dev = s->s_dev;