diff options
| author |   Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-05-13 12:51:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-05-14 15:09:34 -0400 |
| commit | d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f (patch) | |
| tree | 2d439ac7e0a95329daf686ea27ba0cea35acb301 /net/sunrpc | |
| parent | NFS: Read requests can use GFP_KERNEL. (diff) | |
| download | linux-dev-d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f.tar.xz linux-dev-d300a41ef1c39cc5e6b90fd8834ea7ab16b5c48f.zip | |
SUNRPC: Dont run rpcauth_cache_shrinker() when gfp_mask is GFP_NOFS
Under some circumstances, put_rpccred() can end up allocating memory, so
check the gfp_mask to prevent deadlocks.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/auth.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index 95afe79dd9d7..0667a36aee78 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c @@ -270,6 +270,8 @@ rpcauth_cache_shrinker(int nr_to_scan, gfp_t gfp_mask) LIST_HEAD(free); int res; + if ((gfp_mask & GFP_KERNEL) != GFP_KERNEL) + return (nr_to_scan == 0) ? 0 : -1; if (list_empty(&cred_unused)) return 0; spin_lock(&rpc_credcache_lock); |