From b46bd1fe491455573770457a8fa6274f46779879 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 16 May 2012 13:30:35 -0400 Subject: [PATCH] --- yaml --- r: 308633 b: refs/heads/master c: 6b34309936ed5c85cbe5868655814065f42c2f38 h: refs/heads/master i: 308631: 602a019eb63e02edec8edef401cd7b8bcd09780f v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6d12164b6eac..aac128569738 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f23eff3814e9d255464e7a03dba47c27069ac78 +refs/heads/master: 6b34309936ed5c85cbe5868655814065f42c2f38 diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c index 0cbcd1ab49ab..b239e75c483f 100644 --- a/trunk/net/sunrpc/xprt.c +++ b/trunk/net/sunrpc/xprt.c @@ -979,7 +979,7 @@ static void xprt_alloc_slot(struct rpc_task *task) list_del(&req->rq_list); goto out_init_req; } - req = xprt_dynamic_alloc_slot(xprt, GFP_NOWAIT); + req = xprt_dynamic_alloc_slot(xprt, GFP_NOWAIT|__GFP_NOWARN); if (!IS_ERR(req)) goto out_init_req; switch (PTR_ERR(req)) {