1 files changed, 11 insertions, 2 deletions

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 86bea4520c4d..ce927002862a 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -826,8 +826,15 @@ void xprt_connect(struct rpc_task *task)
                         return;
                 if (xprt_test_and_set_connecting(xprt))
                         return;
-                xprt->stat.connect_start = jiffies;
-                xprt->ops->connect(xprt, task);
+                /* Race breaker */
+                if (!xprt_connected(xprt)) {
+                        xprt->stat.connect_start = jiffies;
+                        xprt->ops->connect(xprt, task);
+                } else {
+                        xprt_clear_connecting(xprt);
+                        task->tk_status = 0;
+                        rpc_wake_up_queued_task(&xprt->pending, task);
+                }
         }
         xprt_release_write(xprt, task);
 }
@@ -1623,6 +1630,8 @@ xprt_request_init(struct rpc_task *task)
         req->rq_snd_buf.buflen = 0;
         req->rq_rcv_buf.len = 0;
         req->rq_rcv_buf.buflen = 0;
+        req->rq_snd_buf.bvec = NULL;
+        req->rq_rcv_buf.bvec = NULL;
         req->rq_release_snd_buf = NULL;
         xprt_reset_majortimeo(req);
         dprintk("RPC: %5u reserved req %p xid %08x\n", task->tk_pid,