aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2010-05-13 12:51:06 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2010-05-14 15:09:35 -0400
commit61d5eb2985b3b1d69fd53d7dc9789037c27f8d91 (patch)
tree6e73d0e7adcda510ec47d0cd50c57d4461e7fbdf /fs/nfs
parent20673406534176ead9b984a84b662928110f77b1 (diff)
downloadkernel_samsung_espresso10-61d5eb2985b3b1d69fd53d7dc9789037c27f8d91.zip
kernel_samsung_espresso10-61d5eb2985b3b1d69fd53d7dc9789037c27f8d91.tar.gz
kernel_samsung_espresso10-61d5eb2985b3b1d69fd53d7dc9789037c27f8d91.tar.bz2
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>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/dir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 18da8ab..58b1f74 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) {