aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/inode.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-05-25 01:41:01 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-09 09:34:10 -0400
commit1842bfb447cea8b344fd91af97fb6d604ecb11fa (patch)
tree8f3fb5f9fac687ccee3b98e3f0a513816fe35b36 /fs/nfs/inode.c
parent44b11874ff583b6e766a05856b04f3c492c32b84 (diff)
NFS: Fix up inode revalidation accounting
Currently, we are accounting for all calls to nfs_revalidate_inode(), but not to nfs_revalidate_mapping(), or nfs_lookup_verify_inode(), etc... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/inode.c')
-rw-r--r--fs/nfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 69036ef39866..3200358195be 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1207,6 +1207,7 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
1207 dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n", 1207 dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n",
1208 inode->i_sb->s_id, (long long)NFS_FILEID(inode)); 1208 inode->i_sb->s_id, (long long)NFS_FILEID(inode));
1209 1209
1210 nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);
1210 lock_kernel(); 1211 lock_kernel();
1211 if (!inode || is_bad_inode(inode)) 1212 if (!inode || is_bad_inode(inode))
1212 goto out_nowait; 1213 goto out_nowait;
@@ -1284,7 +1285,6 @@ int nfs_attribute_timeout(struct inode *inode)
1284 */ 1285 */
1285int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 1286int nfs_revalidate_inode(struct nfs_server *server, struct inode *inode)
1286{ 1287{
1287 nfs_inc_stats(inode, NFSIOS_INODEREVALIDATE);
1288 if (!(NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATTR) 1288 if (!(NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATTR)
1289 && !nfs_attribute_timeout(inode)) 1289 && !nfs_attribute_timeout(inode))
1290 return NFS_STALE(inode) ? -ESTALE : 0; 1290 return NFS_STALE(inode) ? -ESTALE : 0;