From: Eldad Zinger Date: Wed, 21 Jul 2010 14:40:45 +0000 (+0300) Subject: sdp: change socket reference semantics: keepalive != alive X-Git-Tag: v4.1.12-92~264^2~5^2~134 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=52ac9bc981dbbd1ba92cd5215be9ec5063f79ac7;p=users%2Fjedix%2Flinux-maple.git 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 --- diff --git a/drivers/infiniband/ulp/sdp/sdp_dbg.h b/drivers/infiniband/ulp/sdp/sdp_dbg.h index ba2e4b6cd2bd2..a9fcf0241e867 100644 --- 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 375a04ad5aaca..3a82c9747c4c4 100644 --- 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)