diff options
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 78144daeb70f..dde545925b4e 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -666,11 +666,6 @@ static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf) | |||
666 | dentry->d_time = verf; | 666 | dentry->d_time = verf; |
667 | } | 667 | } |
668 | 668 | ||
669 | static void nfs_refresh_verifier(struct dentry * dentry, unsigned long verf) | ||
670 | { | ||
671 | nfs_set_verifier(dentry, verf); | ||
672 | } | ||
673 | |||
674 | /* | 669 | /* |
675 | * Return the intent data that applies to this particular path component | 670 | * Return the intent data that applies to this particular path component |
676 | * | 671 | * |
@@ -794,7 +789,7 @@ static int nfs_lookup_revalidate(struct dentry * dentry, struct nameidata *nd) | |||
794 | if ((error = nfs_refresh_inode(inode, &fattr)) != 0) | 789 | if ((error = nfs_refresh_inode(inode, &fattr)) != 0) |
795 | goto out_bad; | 790 | goto out_bad; |
796 | 791 | ||
797 | nfs_refresh_verifier(dentry, verifier); | 792 | nfs_set_verifier(dentry, verifier); |
798 | out_valid: | 793 | out_valid: |
799 | unlock_kernel(); | 794 | unlock_kernel(); |
800 | dput(parent); | 795 | dput(parent); |
@@ -1093,7 +1088,7 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
1093 | verifier = nfs_save_change_attribute(dir); | 1088 | verifier = nfs_save_change_attribute(dir); |
1094 | ret = nfs4_open_revalidate(dir, dentry, openflags, nd); | 1089 | ret = nfs4_open_revalidate(dir, dentry, openflags, nd); |
1095 | if (!ret) | 1090 | if (!ret) |
1096 | nfs_refresh_verifier(dentry, verifier); | 1091 | nfs_set_verifier(dentry, verifier); |
1097 | unlock_kernel(); | 1092 | unlock_kernel(); |
1098 | out: | 1093 | out: |
1099 | dput(parent); | 1094 | dput(parent); |
@@ -1169,10 +1164,8 @@ static struct dentry *nfs_readdir_lookup(nfs_readdir_descriptor_t *desc) | |||
1169 | dentry = alias; | 1164 | dentry = alias; |
1170 | } | 1165 | } |
1171 | 1166 | ||
1172 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | ||
1173 | return dentry; | ||
1174 | out_renew: | 1167 | out_renew: |
1175 | nfs_refresh_verifier(dentry, nfs_save_change_attribute(dir)); | 1168 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); |
1176 | return dentry; | 1169 | return dentry; |
1177 | } | 1170 | } |
1178 | 1171 | ||
@@ -1695,7 +1688,8 @@ out: | |||
1695 | d_rehash(rehash); | 1688 | d_rehash(rehash); |
1696 | if (!error) { | 1689 | if (!error) { |
1697 | d_move(old_dentry, new_dentry); | 1690 | d_move(old_dentry, new_dentry); |
1698 | nfs_refresh_verifier(new_dentry, nfs_save_change_attribute(new_dir)); | 1691 | nfs_set_verifier(new_dentry, |
1692 | nfs_save_change_attribute(new_dir)); | ||
1699 | } | 1693 | } |
1700 | 1694 | ||
1701 | /* new dentry created? */ | 1695 | /* new dentry created? */ |