SUNRPC fix regression in umount of a secure mount

If call_status returns ENOTCONN, we need to re-establish the connection
state after. Otherwise the client goes into an infinite loop of call_encode,
call_transmit, call_status (ENOTCONN), call_encode.

Fixes: c8485e4d63 ("SUNRPC: Handle ECONNREFUSED correctly in xprt_transmit()")
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
Cc: stable@vger.kernel.org # v2.6.29+
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
(cherry picked from commit ec6017d9035986a36de064f48a63245930bfad6f)
Orabug: 29926734
Signed-off-by: Calum Mackay <calum.mackay@oracle.com>
Reviewed-by: Bill Baker <bill.baker@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 9d7bc3aafbff298615cf794f1ec03a373be48423..d466a2a5d014f7586f1c04d0accd997aa01e77cc 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -2051,12 +2051,12 @@ call_status(struct rpc_task *task)
        case -ECONNREFUSED:
        case -ECONNRESET:
        case -ECONNABORTED:
+       case -ENOTCONN:
                rpc_force_rebind(clnt);
        case -EADDRINUSE:
        case -ENOBUFS:
                rpc_delay(task, 3*HZ);
        case -EPIPE:
-       case -ENOTCONN:
                task->tk_action = call_bind;
                break;
        case -EAGAIN: