Attachment 585624 Details for Bug 822189 – patch -- fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot

[patch] patch -- fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot

0001-BZ-822189-sunrpc-fix-loss-of-task-tk_status-after-rp.patch (text/plain), 1.84 KB, created by Jeff Layton on 2012-05-20 11:06:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2012-05-20 11:06:57 UTC

Size: 1.84 KB

patch

obsolete

>From 92aa2f3df7256a153bc70e6210c6168434bd37b2 Mon Sep 17 00:00:00 2001
>From: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date: Sun, 20 May 2012 07:02:08 -0400
>Subject: [RHEL6 PATCH] BZ#822189: sunrpc: fix loss of task->tk_status after rpc_delay call in xprt_alloc_slot
>
>xprt_alloc_slot will call rpc_delay() to make the task wait a bit before
>retrying when it gets back an -ENOMEM error from xprt_dynamic_alloc_slot.
>The problem is that rpc_delay will clear the task->tk_status, causing
>call_reserveresult to abort the task.
>
>The solution is simply to let call_reserveresult handle the ENOMEM error
>directly.
>
>Reported-by: Jeff Layton <jlayton@redhat.com>
>Cc: stable@vger.kernel.org [>= 3.1]
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>---
> net/sunrpc/clnt.c |    2 ++
> net/sunrpc/xprt.c |    5 +++--
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
>diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
>index 0e2b868..86376bd 100644
>--- a/net/sunrpc/clnt.c
>+++ b/net/sunrpc/clnt.c
>@@ -962,6 +962,8 @@ call_reserveresult(struct rpc_task *task)
> 	}
> 
> 	switch (status) {
>+	case -ENOMEM:
>+		rpc_delay(task, HZ >> 2);
> 	case -EAGAIN:	/* woken up; retry */
> 		task->tk_action = call_reserve;
> 		return;
>diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
>index 3dda0dd..ae0bdc9 100644
>--- a/net/sunrpc/xprt.c
>+++ b/net/sunrpc/xprt.c
>@@ -979,15 +979,16 @@ static void xprt_alloc_slot(struct rpc_task *task)
> 		goto out_init_req;
> 	switch (PTR_ERR(req)) {
> 	case -ENOMEM:
>-		rpc_delay(task, HZ >> 2);
> 		dprintk("RPC:       dynamic allocation of request slot "
> 				"failed! Retrying\n");
>+		task->tk_status = -ENOMEM;
> 		break;
> 	case -EAGAIN:
> 		rpc_sleep_on(&xprt->backlog, task, NULL);
> 		dprintk("RPC:       waiting for request slot\n");
>+	default:
>+		task->tk_status = -EAGAIN;
> 	}
>-	task->tk_status = -EAGAIN;
> 	return;
> out_init_req:
> 	task->tk_status = 0;
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 822189: 584998 | 585018 | 585310 | 585624