sdp: change socket reference semantics: keepalive != alive

keepalive timer manages a socket reference count regardless to the initial
socket reference (SOCK_REF_ALIVE).

Signed-off-by: Eldad Zinger <eldadz@mellanox.co.il>

diff --git a/drivers/infiniband/ulp/sdp/sdp_dbg.h b/drivers/infiniband/ulp/sdp/sdp_dbg.h
index ba2e4b6cd2bd26b7616618f0287e0b45383ec72f..a9fcf0241e8670aa0f5e2e970be4fa4438e194df 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_dbg.h
+++ b/drivers/infiniband/ulp/sdp/sdp_dbg.h
@@ -151,6 +151,7 @@ extern int sdp_data_debug_level;
 #define SOCK_REF_DREQ_TO "DREQ_TO" /* dreq timeout is pending */
 #define SOCK_REF_ZCOPY "ZCOPY" /* zcopy send in process */
 #define SOCK_REF_RDMA_RD "RDMA_RD" /* RDMA read in process */
+#define SOCK_REF_KEEPALIVE "KEEPALIVE" /* socket is held by sk_reset_timer */
 
 #define sock_hold(sk, msg)  sock_ref(sk, msg, sock_hold)
 #define sock_put(sk, msg)  sock_ref(sk, msg, sock_put)

diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index 375a04ad5aaca066341af96fb906b4a54c2486b4..3a82c9747c4c4d15960ef24daee3e40bcf8a038e 100644 (file)
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -250,7 +250,7 @@ static void sdp_keepalive_timer(unsigned long data)
 
 out:
        bh_unlock_sock(sk);
-       sock_put(sk, SOCK_REF_ALIVE);
+       sock_put(sk, SOCK_REF_KEEPALIVE);
 }
 
 static void sdp_init_keepalive_timer(struct sock *sk)