From 0aab9fe67a996315d6cc58850abe482b090e2334 Mon Sep 17 00:00:00 2001 From: Tom Talpey Date: Fri, 10 Oct 2008 11:32:45 -0400 Subject: [PATCH] --- yaml --- r: 115423 b: refs/heads/master c: c055551e97e1ca00781bc41523f829e05a8afed7 h: refs/heads/master i: 115421: 3d1458150c205eec7fbb88184fb8367059b25d63 115419: 04a2360a4d2204b24e6596ecaa6ae663d5541073 115415: 85b2fadac7078988b5262f5dfda40afe81bb9b1c 115407: fe830de6a89ebde2d1066638d3974fbd94bbafd5 115391: 118979d7ab73e5ea982aca8b8306cf46b184f407 v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprtrdma/verbs.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ba437e323390..b118a4714ee9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08ca0dce1eafa419059ac4cad9ed522af7052526 +refs/heads/master: c055551e97e1ca00781bc41523f829e05a8afed7 diff --git a/trunk/net/sunrpc/xprtrdma/verbs.c b/trunk/net/sunrpc/xprtrdma/verbs.c index 170e69cba6c4..a5fef5e6c323 100644 --- a/trunk/net/sunrpc/xprtrdma/verbs.c +++ b/trunk/net/sunrpc/xprtrdma/verbs.c @@ -804,9 +804,8 @@ rpcrdma_ep_connect(struct rpcrdma_ep *ep, struct rpcrdma_ia *ia) struct rdma_cm_id *id; int rc = 0; int retry_count = 0; - int reconnect = (ep->rep_connected != 0); - if (reconnect) { + if (ep->rep_connected != 0) { struct rpcrdma_xprt *xprt; retry: rc = rpcrdma_ep_disconnect(ep, ia); @@ -871,9 +870,6 @@ if (strnicmp(ia->ri_id->device->dma_device->bus->name, "pci", 3) == 0) { goto out; } - if (reconnect) - return 0; - wait_event_interruptible(ep->rep_connect_wait, ep->rep_connected != 0); /*