[azure:x/azure-edge:x][PATCH 4/6] UBUNTU: SAUCE: vmbus-rdma: ND144: don't wait forever for disconnection from remote connector

[Marcelo Henrique Cerri]

From: Long Li <longli at microsoft.com>

BugLink: http://bugs.launchpad.net/bugs/1749332

Signed-off-by: Long Li <longli at microsoft.com>
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c
index 58de2d439f29..f9179722156e 100644
--- a/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c
+++ b/drivers/infiniband/hw/vmbus-rdma/vmbus-rdma-144.0/provider.c
@@ -1012,7 +1012,10 @@ static int hvnd_destroy_qp(struct ib_qp *ib_qp)
 	 * Now wait for the disconnect.
 	 */
 	jiffies = get_jiffies_64();
-	wait_for_completion(&qp->connector->disconnect_event);
+	if (!wait_for_completion_timeout(&qp->connector->disconnect_event,
+					 30*HZ))
+		hvnd_warn("connector disconnect timed out\n");
+
 	hvnd_debug("Completed disconnect connector=%p jiffies=%llu\n",
 		   qp->connector, get_jiffies_64() - jiffies);
 
-- 
2.7.4