RPC: Fix a bug introduced by trond.myklebust@fys.uio.no|ChangeSet|20040314024328|33542.

  portmap can fail due to the call to xprt_close() in xprt_connect():
    xprt_disconnect() wakes up xprt->snd_task, and sets -ENOTCONN,
    which again gets converted to EIO by xprt_connect_status()

  Fix is to remove call to xprt_disconnect(). We don't need it in the
  case when we are reconnecting. However we do need to ensure that we
  wake up xprt->snd_task if reconnection fails.

  Diagnosis & proposed solution by Olaf Kirch

net/sunrpc/xprt.c

@@ -405,7 +405,6 @@ xprt_close(struct rpc_xprt *xprt)
 	sk->sk_write_space  = xprt->old_write_space;
 	write_unlock_bh(&sk->sk_callback_lock);
 
-	xprt_disconnect(xprt);
 	sk->sk_no_check	 = 0;
 
 	sock_release(sock);
@@ -416,6 +415,7 @@ xprt_socket_autoclose(void *args)
 {
 	struct rpc_xprt *xprt = (struct rpc_xprt *)args;
 
+	xprt_disconnect(xprt);
 	xprt_close(xprt);
 	xprt_release_write(xprt, NULL);
 }
@@ -511,7 +511,8 @@ static void xprt_socket_connect(void *args)
 	if (xprt->snd_task) {
 		xprt->snd_task->tk_status = status;
 		rpc_wake_up_task(xprt->snd_task);
-	}
+	} else
+		rpc_wake_up_status(&xprt->pending, -ENOTCONN);
 	spin_unlock_bh(&xprt->sock_lock);
 }
 
@@ -1642,6 +1643,7 @@ xprt_destroy(struct rpc_xprt *xprt)
 {
 	dprintk("RPC:      destroying transport %p\n", xprt);
 	xprt_shutdown(xprt);
+	xprt_disconnect(xprt);
 	xprt_close(xprt);
 	kfree(xprt->slot);
 	kfree(xprt);