diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-06-10 16:03:43 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-07-14 08:34:14 -0400 |
commit | 0b728e1911cbe6e24020727c3870628b9653f32a (patch) | |
tree | cd975921b28300d62f3aca2fc37eef28af89b959 /fs/nfs | |
parent | fa3c56bbda6c2ac2a57d96ba501dbe85cccd312b (diff) |
stop passing nameidata * to ->d_revalidate()
Just the lookup flags. Die, bastard, die...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/dir.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 71a199435ca9..656f52e9aa2e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -1098,9 +1098,8 @@ int nfs_neg_need_reval(struct inode *dir, struct dentry *dentry, | |||
1098 | * If the parent directory is seen to have changed, we throw out the | 1098 | * If the parent directory is seen to have changed, we throw out the |
1099 | * cached dentry and do a new lookup. | 1099 | * cached dentry and do a new lookup. |
1100 | */ | 1100 | */ |
1101 | static int nfs_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) | 1101 | static int nfs_lookup_revalidate(struct dentry *dentry, unsigned int flags) |
1102 | { | 1102 | { |
1103 | unsigned int flags = nd->flags; | ||
1104 | struct inode *dir; | 1103 | struct inode *dir; |
1105 | struct inode *inode; | 1104 | struct inode *inode; |
1106 | struct dentry *parent; | 1105 | struct dentry *parent; |
@@ -1339,7 +1338,7 @@ out: | |||
1339 | } | 1338 | } |
1340 | 1339 | ||
1341 | #ifdef CONFIG_NFS_V4 | 1340 | #ifdef CONFIG_NFS_V4 |
1342 | static int nfs4_lookup_revalidate(struct dentry *, struct nameidata *); | 1341 | static int nfs4_lookup_revalidate(struct dentry *, unsigned int); |
1343 | 1342 | ||
1344 | const struct dentry_operations nfs4_dentry_operations = { | 1343 | const struct dentry_operations nfs4_dentry_operations = { |
1345 | .d_revalidate = nfs4_lookup_revalidate, | 1344 | .d_revalidate = nfs4_lookup_revalidate, |
@@ -1491,9 +1490,8 @@ no_open: | |||
1491 | return finish_no_open(file, res); | 1490 | return finish_no_open(file, res); |
1492 | } | 1491 | } |
1493 | 1492 | ||
1494 | static int nfs4_lookup_revalidate(struct dentry *dentry, struct nameidata *nd) | 1493 | static int nfs4_lookup_revalidate(struct dentry *dentry, unsigned int flags) |
1495 | { | 1494 | { |
1496 | unsigned int flags = nd->flags; | ||
1497 | struct dentry *parent = NULL; | 1495 | struct dentry *parent = NULL; |
1498 | struct inode *inode; | 1496 | struct inode *inode; |
1499 | struct inode *dir; | 1497 | struct inode *dir; |
@@ -1537,7 +1535,7 @@ out: | |||
1537 | no_open_dput: | 1535 | no_open_dput: |
1538 | dput(parent); | 1536 | dput(parent); |
1539 | no_open: | 1537 | no_open: |
1540 | return nfs_lookup_revalidate(dentry, nd); | 1538 | return nfs_lookup_revalidate(dentry, flags); |
1541 | } | 1539 | } |
1542 | 1540 | ||
1543 | #endif /* CONFIG_NFSV4 */ | 1541 | #endif /* CONFIG_NFSV4 */ |