Attachment 291005 Details for Bug 204309 – patch -- clean up soft task error handling

[patch] patch -- clean up soft task error handling

0001-SUNRPC-Clean-up-soft-task-error-handling.patch (text/plain), 3.34 KB, created by Jeff Layton on 2008-01-07 20:05:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-01-07 20:05:14 UTC

Size: 3.34 KB

patch

obsolete

>From da45828e2835057045150b318c4fbe9bb91f18dd Mon Sep 17 00:00:00 2001
>From: Trond Myklebust <Trond.Myklebust@netapp.com>
>Date: Thu, 31 Aug 2006 15:44:52 -0400
>Subject: [PATCH] SUNRPC: Clean up soft task error handling
>
>- Ensure that the task aborts the RPC call only when it has actually timed out.
> - Ensure that req->rq_majortimeo is initialised correctly.
>
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>---
> net/sunrpc/clnt.c |   34 ++++++++++++++--------------------
> net/sunrpc/xprt.c |    8 +-------
> 2 files changed, 15 insertions(+), 27 deletions(-)
>
>diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
>index 355e786..ceadb72 100644
>--- a/net/sunrpc/clnt.c
>+++ b/net/sunrpc/clnt.c
>@@ -863,15 +863,11 @@ call_bind_status(struct rpc_task *task)
> 		dprintk("RPC: %4d remote rpcbind: RPC program/version unavailable\n",
> 				task->tk_pid);
> 		rpc_delay(task, 3*HZ);
>-		goto retry_bind;
>+		goto retry_timeout;
> 	case -ETIMEDOUT:
> 		dprintk("RPC: %4d rpcbind request timed out\n",
> 				task->tk_pid);
>-		if (RPC_IS_SOFT(task)) {
>-			status = -EIO;
>-			break;
>-		}
>-		goto retry_bind;
>+		goto retry_timeout;
> 	case -EPFNOSUPPORT:
> 		dprintk("RPC: %4d remote rpcbind service unavailable\n",
> 				task->tk_pid);
>@@ -884,16 +880,13 @@ call_bind_status(struct rpc_task *task)
> 		dprintk("RPC: %4d unrecognized rpcbind error (%d)\n",
> 				task->tk_pid, -task->tk_status);
> 		status = -EIO;
>-		break;
> 	}
> 
> 	rpc_exit(task, status);
> 	return;
> 
>-retry_bind:
>-	task->tk_status = 0;
>-	task->tk_action = call_bind;
>-	return;
>+retry_timeout:
>+	task->tk_action = call_timeout;
> }
> 
> /*
>@@ -941,14 +934,16 @@ call_connect_status(struct rpc_task *task)
> 
> 	switch (status) {
> 	case -ENOTCONN:
>-	case -ETIMEDOUT:
> 	case -EAGAIN:
> 		task->tk_action = call_bind;
>-		break;
>-	default:
>-		rpc_exit(task, -EIO);
>-		break;
>+		if (!RPC_IS_SOFT(task))
>+			return;
>+		/* if soft mounted, test if we've timed out */
>+	case -ETIMEDOUT:
>+		task->tk_action = call_timeout;
>+		return;
> 	}
>+	rpc_exit(task, -EIO);
> }
> 
> /*
>@@ -1057,7 +1052,6 @@ call_status(struct rpc_task *task)
> 		printk("%s: RPC call returned error %d\n",
> 			       clnt->cl_protname, -status);
> 		rpc_exit(task, status);
>-		break;
> 	}
> }
> 
>@@ -1125,10 +1119,10 @@ call_decode(struct rpc_task *task)
> 			clnt->cl_stats->rpcretrans++;
> 			goto out_retry;
> 		}
>-		printk(KERN_WARNING "%s: too small RPC reply size (%d bytes)\n",
>+		dprintk("%s: too small RPC reply size (%d bytes)\n",
> 			clnt->cl_protname, task->tk_status);
>-		rpc_exit(task, -EIO);
>-		return;
>+		task->tk_action = call_timeout;
>+		goto out_retry;
> 	}
> 
> 	/*
>diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
>index e4f64fb..a85f82b 100644
>--- a/net/sunrpc/xprt.c
>+++ b/net/sunrpc/xprt.c
>@@ -585,13 +585,6 @@ static void xprt_connect_status(struct rpc_task *task)
> 				task->tk_pid, -task->tk_status, task->tk_client->cl_server);
> 		xprt_release_write(xprt, task);
> 		task->tk_status = -EIO;
>-		return;
>-	}
>-
>-	/* if soft mounted, just cause this RPC to fail */
>-	if (RPC_IS_SOFT(task)) {
>-		xprt_release_write(xprt, task);
>-		task->tk_status = -EIO;
> 	}
> }
> 
>@@ -829,6 +822,7 @@ static void xprt_request_init(struct rpc_task *task, struct rpc_xprt *xprt)
> 	req->rq_bufsize = 0;
> 	req->rq_xid     = xprt_alloc_xid(xprt);
> 	req->rq_release_snd_buf = NULL;
>+	xprt_reset_majortimeo(req);
> 	dprintk("RPC: %4d reserved req %p xid %08x\n", task->tk_pid,
> 			req, ntohl(req->rq_xid));
> }
>-- 
>1.5.3.3
>

Actions: View | Diff

Attachments on bug 204309: 144999 | 197201 | 198961 | 291005