Fixes an obvious bug in __nfs_refresh_inode(): after updating the
attribute cache, if we discover that the data cache is invalid don't
call nfs_zap_caches() as that will also reinvalidate the attribute
cache.
This bug plays havoc with the new lookup/revalidation code in 2.4.19
since it forces a lot of unnecessary extra GETATTR RPC calls.
Cheers,
Trond
diff -u --recursive --new-file linux-2.4.19-pre10/fs/nfs/inode.c linux-2.4.19-fix_refresh1/fs/nfs/inode.c
--- linux-2.4.19-pre10/fs/nfs/inode.c Tue Mar 12 16:35:02 2002
+++ linux-2.4.19-fix_refresh1/fs/nfs/inode.c Tue Jun 25 17:40:36 2002
@@ -1087,14 +1087,17 @@
inode->i_rdev = to_kdev_t(fattr->rdev);
/* Update attrtimeo value */
- if (!invalid && time_after(jiffies, NFS_ATTRTIMEO_UPDATE(inode)+NFS_ATTRTIMEO(inode))) {
+ if (invalid) {
+ NFS_ATTRTIMEO(inode) = NFS_MINATTRTIMEO(inode);
+ NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
+ invalidate_inode_pages(inode);
+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
+ } else if (time_after(jiffies, NFS_ATTRTIMEO_UPDATE(inode)+NFS_ATTRTIMEO(inode))) {
if ((NFS_ATTRTIMEO(inode) <<= 1) > NFS_MAXATTRTIMEO(inode))
NFS_ATTRTIMEO(inode) = NFS_MAXATTRTIMEO(inode);
NFS_ATTRTIMEO_UPDATE(inode) = jiffies;
}
- if (invalid)
- nfs_zap_caches(inode);
return 0;
out_nochange:
if (new_atime - inode->i_atime > 0)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Jun 30 2002 - 22:00:10 EST