[PATCH] RPC: return task->tk_status from rpc_wait_for_completion_task() in case of successfull task completion

[PATCH] RPC: return task->tk_status from rpc_wait_for_completion_task() in case of successfull task completion

[Stanislav Kinsbursky]

Some NFS and NLM routines doesn't check RPC task tk_status if
rpc_wait_for_completion_task() returned 0 but have to.
The best way to handle such RPC task error, from my pow, is to return RPC task
tk_status from rpc_wait_for_completion_task() instead of 0 value.
This approach will cover RPC tasks error status since NFS and NLM routines
checks rpc_wait_for_completion_task() result.

Kernel version affected: 2.6.38

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

---
 include/linux/sunrpc/sched.h |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index d81db80..f733036 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -245,7 +245,12 @@ void		rpc_prepare_task(struct rpc_task *task);
 
 static inline int rpc_wait_for_completion_task(struct rpc_task *task)
 {
-	return __rpc_wait_for_completion_task(task, NULL);
+	int res;
+
+	res = __rpc_wait_for_completion_task(task, NULL);
+	if (res == 0)
+		res = task->tk_status;
+	return res;
 }
 
 static inline void rpc_task_set_priority(struct rpc_task *task, unsigned char prio)

Re: [PATCH] RPC: return task->tk_status from rpc_wait_for_completion_task() in case of successfull task completion

[Trond Myklebust]

On Tue, 2011-03-15 at 17:20 +0300, Stanislav Kinsbursky wrote:
> Some NFS and NLM routines doesn't check RPC task tk_status if
> rpc_wait_for_completion_task() returned 0 but have to.

Examples please. I'm not aware of any such cases.

Cheers
   Trond

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@netapp.com
www.netapp.com

Re: [PATCH] RPC: return task->tk_status from rpc_wait_for_completion_task() in case of successfull task completion

[Stanislav Kinsbursky]

15.03.2011 17:26, Trond Myklebust =D0=BF=D0=B8=D1=88=D0=B5=D1=82:
> On Tue, 2011-03-15 at 17:20 +0300, Stanislav Kinsbursky wrote:
>> Some NFS and NLM routines doesn't check RPC task tk_status if
>> rpc_wait_for_completion_task() returned 0 but have to.
>
> Examples please. I'm not aware of any such cases.
>
> Cheers
>     Trond
>

You are right. I was confused with different logic for NSFv4, NLM and N=
=46Sv3.
Drop the patch.
Sorry.

--=20
Best regards,
Stanislav Kinsbursky