diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-01 21:42:01 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-10-09 17:20:06 -0400 |
commit | d75340cc4de5c187fbf0bba234309ca86cf0a2fb (patch) | |
tree | aa53e3248bf3d61283f94187ffc83b18fa06bb7a /fs/nfs/dir.c | |
parent | 216d5d06883edfaf992ada0d72a2a22fdfdbd296 (diff) |
NFSv4: Fix nfs_atomic_open() to set the verifier on negative dentries too
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/dir.c')
-rw-r--r-- | fs/nfs/dir.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index 41b063c98822..82878a19538d 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c | |||
@@ -656,11 +656,6 @@ static int nfs_check_verifier(struct inode *dir, struct dentry *dentry) | |||
656 | return 1; | 656 | return 1; |
657 | } | 657 | } |
658 | 658 | ||
659 | static inline void nfs_set_verifier(struct dentry * dentry, unsigned long verf) | ||
660 | { | ||
661 | dentry->d_time = verf; | ||
662 | } | ||
663 | |||
664 | /* | 659 | /* |
665 | * Return the intent data that applies to this particular path component | 660 | * Return the intent data that applies to this particular path component |
666 | * | 661 | * |
@@ -1016,7 +1011,6 @@ static struct dentry *nfs_atomic_lookup(struct inode *dir, struct dentry *dentry | |||
1016 | } | 1011 | } |
1017 | } else if (res != NULL) | 1012 | } else if (res != NULL) |
1018 | dentry = res; | 1013 | dentry = res; |
1019 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | ||
1020 | out: | 1014 | out: |
1021 | return res; | 1015 | return res; |
1022 | no_open: | 1016 | no_open: |
@@ -1060,8 +1054,6 @@ static int nfs_open_revalidate(struct dentry *dentry, struct nameidata *nd) | |||
1060 | */ | 1054 | */ |
1061 | lock_kernel(); | 1055 | lock_kernel(); |
1062 | ret = nfs4_open_revalidate(dir, dentry, openflags, nd); | 1056 | ret = nfs4_open_revalidate(dir, dentry, openflags, nd); |
1063 | if (ret == 1) | ||
1064 | nfs_set_verifier(dentry, nfs_save_change_attribute(dir)); | ||
1065 | unlock_kernel(); | 1057 | unlock_kernel(); |
1066 | out: | 1058 | out: |
1067 | dput(parent); | 1059 | dput(parent); |