Make the client act correctly if the RPC server's asserts

that it does not support a given program, version or
procedure call.

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index 36c1f394b0070f28e501674e5a6b5ffc0fc2ad8f..466b0f810bd44226753a410e75e840ee4aa7793c 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -960,6 +960,24 @@ call_verify(struct rpc_task *task)
        switch ((n = ntohl(*p++))) {
        case RPC_SUCCESS:
                return p;
+       case RPC_PROG_UNAVAIL:
+               printk(KERN_WARNING "RPC: %4d call_verify: program %u is unsupported by server %s\n",
+                               task->tk_pid, (unsigned int)task->tk_client->cl_prog,
+                               task->tk_client->cl_server);
+               goto out_eio;
+       case RPC_PROG_MISMATCH:
+               printk(KERN_WARNING "RPC: %4d call_verify: program %u, version %u unsupported by server %s\n",
+                               task->tk_pid, (unsigned int)task->tk_client->cl_prog,
+                               (unsigned int)task->tk_client->cl_vers,
+                               task->tk_client->cl_server);
+               goto out_eio;
+       case RPC_PROC_UNAVAIL:
+               printk(KERN_WARNING "RPC: %4d call_verify: proc %u unsupported by program %u, version %u on server %s\n",
+                               task->tk_pid, (unsigned int)task->tk_msg.rpc_proc,
+                               (unsigned int)task->tk_client->cl_prog,
+                               (unsigned int)task->tk_client->cl_vers,
+                               task->tk_client->cl_server);
+               goto out_eio;
        case RPC_GARBAGE_ARGS:
                break;                  /* retry */
        default:
@@ -977,6 +995,7 @@ garbage:
                return NULL;
        }
        printk(KERN_WARNING "RPC: garbage, exit EIO\n");
+out_eio:
        rpc_exit(task, -EIO);
        return NULL;
 }