summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTom Talpey <talpey@netapp.com>2008-10-09 15:01:41 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-10-10 15:13:31 -0400
commit5675add36e76b9487e7f9e689f854cb8d6afd9b4 (patch)
tree414b5e26b099c6aa42ee989925c0dfb8b717366e /include
parent1a954051b0cf79bd67e5f9db40333e3a9b1d05d2 (diff)
downloadblackbird-op-linux-5675add36e76b9487e7f9e689f854cb8d6afd9b4.tar.gz
blackbird-op-linux-5675add36e76b9487e7f9e689f854cb8d6afd9b4.zip
RPC/RDMA: harden connection logic against missing/late rdma_cm upcalls.
Add defensive timeouts to wait_for_completion() calls in RDMA address resolution, and make them interruptible. Fix the timeout units to milliseconds (formerly jiffies) and move to private header. Signed-off-by: Tom Talpey <talpey@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sunrpc/xprtrdma.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/sunrpc/xprtrdma.h b/include/linux/sunrpc/xprtrdma.h
index 55a5d92ca1e2..54a379c9e8eb 100644
--- a/include/linux/sunrpc/xprtrdma.h
+++ b/include/linux/sunrpc/xprtrdma.h
@@ -66,9 +66,6 @@
#define RPCRDMA_INLINE_PAD_THRESH (512)/* payload threshold to pad (bytes) */
-#define RDMA_RESOLVE_TIMEOUT (5*HZ) /* TBD 5 seconds */
-#define RDMA_CONNECT_RETRY_MAX (2) /* retries if no listener backlog */
-
/* memory registration strategies */
#define RPCRDMA_PERSISTENT_REGISTRATION (1)
OpenPOWER on IntegriCloud