From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 18 May 2010 08:34:28 +0000 (+0300)
Subject: sdp: unnecessary wait-queue removed from sdp_sock structure.
X-Git-Tag: v4.1.12-92~264^2~5^2~186
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5acac39654c450c86764cc7580b7b8cb9e855a65;p=users%2Fjedix%2Flinux-maple.git

sdp: unnecessary wait-queue removed from sdp_sock structure.

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

diff --git a/drivers/infiniband/ulp/sdp/sdp.h b/drivers/infiniband/ulp/sdp/sdp.h
index 453a1e5a16d10..bb258c68b73ef 100644
--- a/drivers/infiniband/ulp/sdp/sdp.h
+++ b/drivers/infiniband/ulp/sdp/sdp.h
@@ -340,7 +340,6 @@ struct sdp_sock {
 	int max_sge;
 
 	struct work_struct rx_comp_work;
-	wait_queue_head_t wq;
 
 	struct delayed_work dreq_wait_work;
 	struct work_struct destroy_work;
diff --git a/drivers/infiniband/ulp/sdp/sdp_cma.c b/drivers/infiniband/ulp/sdp/sdp_cma.c
index e2816544f771a..128d625836488 100644
--- a/drivers/infiniband/ulp/sdp/sdp_cma.c
+++ b/drivers/infiniband/ulp/sdp/sdp_cma.c
@@ -127,8 +127,6 @@ static int sdp_init_qp(struct sock *sk, struct rdma_cm_id *id)
 	sdp_sk(sk)->qp_active = 1;
 	sdp_sk(sk)->context.device = device;
 
-	init_waitqueue_head(&sdp_sk(sk)->wq);
-
 	sdp_dbg(sk, "%s done\n", __func__);
 	return 0;
 
diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index d5bfe698514e3..0bfb6b6e82cea 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -466,7 +466,6 @@ void sdp_reset(struct sock *sk)
 	err = (sk->sk_shutdown & RCV_SHUTDOWN) ? EPIPE : ECONNRESET;
 
 	sdp_set_error(sk, -err);
-	wake_up(&sdp_sk(sk)->wq);
 	sk->sk_state_change(sk);
 }
 
diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 173949eab7627..1f697ccebc1aa 100644
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -157,7 +157,6 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
 		sdp_cleanup_sdp_buf(ssk, tx_req, skb->len - skb->data_len, DMA_TO_DEVICE);
 
 		sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-		wake_up(&ssk->wq);
 
 		goto err;
 	}
@@ -219,7 +218,6 @@ static int sdp_handle_send_comp(struct sdp_sock *ssk, struct ib_wc *wc)
 			sdp_dbg_data(sk, "Send completion with error. "
 				"Status %d\n", wc->status);
 			sdp_set_error(sk, -ECONNRESET);
-			wake_up(&ssk->wq);
 
 			queue_work(sdp_wq, &ssk->destroy_work);
 		}
@@ -281,7 +279,6 @@ static inline void sdp_process_tx_wc(struct sdp_sock *ssk, struct ib_wc *wc)
 		return;
 
 	sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-	wake_up(&ssk->wq);
 }
 
 static int sdp_process_tx_cq(struct sdp_sock *ssk)
@@ -459,7 +456,6 @@ void sdp_post_keepalive(struct sdp_sock *ssk)
 		sdp_dbg(&ssk->isk.sk,
 			"ib_post_keepalive failed with status %d.\n", rc);
 		sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-		wake_up(&ssk->wq);
 	}
 
 	sdp_cnt(sdp_keepalive_probes_sent);
diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index a6f8b14c5b815..7b9a6c497076a 100644
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -140,7 +140,6 @@ void srcavail_cancel_timeout(struct work_struct *work)
 	sdp_dbg_data(sk, "both SrcAvail and SrcAvailCancel timedout."
 			" closing connection\n");
 	sdp_set_error(sk, -ECONNRESET);
-	wake_up(&ssk->wq);
 
 	release_sock(sk);
 }
@@ -575,7 +574,6 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
 	if (unlikely(rc)) {
 		sdp_warn(sk, "ib_post_send failed with status %d.\n", rc);
 		sdp_set_error(&ssk->isk.sk, -ECONNRESET);
-		wake_up(&ssk->wq);
 		goto err_post_send;
 	}