aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/nfs4proc.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-08 09:24:22 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:20:47 -0400
commit40d24704091c8a29a4c99d25670f1996749aea6f (patch)
tree511140e99865bd1610a6df1bd81c9321b7749005 /fs/nfs/nfs4proc.c
parent9e08a3c5aec5b745e844328bcbc16458b6118faf (diff)
NFS: Fix a connectathon regression in NFSv3 and NFSv4
We're failing basic test6 against Linux servers because they lack a correct change attribute. The fix is to assume that we always want to invalidate the readdir caches when we call update_changeattr and/or nfs_post_op_update_inode on a directory. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r--fs/nfs/nfs4proc.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 30d5dd5735cd..cb99fd90a9ac 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -208,12 +208,10 @@ static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)
208 struct nfs_inode *nfsi = NFS_I(dir); 208 struct nfs_inode *nfsi = NFS_I(dir);
209 209
210 spin_lock(&dir->i_lock); 210 spin_lock(&dir->i_lock);
211 if (cinfo->after != nfsi->change_attr) { 211 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;
212 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA; 212 if (!cinfo->atomic || cinfo->before != nfsi->change_attr)
213 if (!cinfo->atomic || cinfo->before != nfsi->change_attr) 213 nfsi->cache_change_attribute = jiffies;
214 nfsi->cache_change_attribute = jiffies; 214 nfsi->change_attr = cinfo->after;
215 nfsi->change_attr = cinfo->after;
216 }
217 spin_unlock(&dir->i_lock); 215 spin_unlock(&dir->i_lock);
218} 216}
219 217