From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 13 May 2010 16:51:06 +0000 (-0400)
Subject: NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS
X-Git-Tag: v2.6.35-rc1~490^2~6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61d5eb2985b3b1d69fd53d7dc9789037c27f8d91;p=pandora-kernel.git

NFS: Don't run nfs_access_cache_shrinker() when the mask is GFP_NOFS

Both iput() and put_rpccred() might allocate memory under certain
circumstances, so make sure that we don't recurse and deadlock...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 18da8abbece8..58b1f744c91e 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1703,6 +1703,8 @@ int nfs_access_cache_shrinker(int nr_to_scan, gfp_t gfp_mask)
 	struct nfs_inode *nfsi;
 	struct nfs_access_entry *cache;
 
+	if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL)
+		return (nr_to_scan == 0) ? 0 : -1;
 restart:
 	spin_lock(&nfs_access_lru_lock);
 	list_for_each_entry(nfsi, &nfs_access_lru_list, access_cache_inode_lru) {