From a3f547f25c7cb03aaf9b431eacbca77fb155ac58 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Fri, 25 Jan 2008 16:38:17 -0500 Subject: [PATCH] --- yaml --- r: 79680 b: refs/heads/master c: 6f23e3872cff238589f9bf39c71db2ea880c9a26 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/dir.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de4c6405cbb1..18ecdd5919ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e6f810759505bc86c009854b82cc495ffd8eb020 +refs/heads/master: 6f23e3872cff238589f9bf39c71db2ea880c9a26 diff --git a/trunk/fs/nfs/dir.c b/trunk/fs/nfs/dir.c index 5ca762de88bf..476cb0f837fd 100644 --- a/trunk/fs/nfs/dir.c +++ b/trunk/fs/nfs/dir.c @@ -1694,13 +1694,19 @@ int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask) restart: spin_lock(&nfs_access_lru_lock); list_for_each_entry(nfsi, &nfs_access_lru_list, access_cache_inode_lru) { + struct rw_semaphore *s_umount; struct inode *inode; if (nr_to_scan-- == 0) break; + s_umount = &nfsi->vfs_inode.i_sb->s_umount; + if (!down_read_trylock(s_umount)) + continue; inode = igrab(&nfsi->vfs_inode); - if (inode == NULL) + if (inode == NULL) { + up_read(s_umount); continue; + } spin_lock(&inode->i_lock); if (list_empty(&nfsi->access_cache_entry_lru)) goto remove_lru_entry; @@ -1719,6 +1725,7 @@ int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask) spin_unlock(&inode->i_lock); spin_unlock(&nfs_access_lru_lock); iput(inode); + up_read(s_umount); goto restart; } spin_unlock(&nfs_access_lru_lock);