From: Eldad Zinger <eldadz@mellanox.co.il>
Date: Tue, 1 Jun 2010 08:42:35 +0000 (+0300)
Subject: sdp: SDP_WARN_ON defined to be used instead of WARN_ON, for better compatibility
X-Git-Tag: v4.1.12-92~264^2~5^2~180
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f3dfc1a93789864eac835cfa2a4e59009f050042;p=users%2Fjedix%2Flinux-maple.git

sdp: SDP_WARN_ON defined to be used instead of WARN_ON, for better compatibility

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 4c0c37b3737b8..a60a5c8c61d88 100644
--- a/drivers/infiniband/ulp/sdp/sdp_dbg.h
+++ b/drivers/infiniband/ulp/sdp/sdp_dbg.h
@@ -8,6 +8,8 @@
 #endif
 //#define GETNSTIMEODAY_SUPPORTED
 
+#define SDP_WARN_ON(x) WARN_ON(x)
+
 #define _sdp_printk(func, line, level, sk, format, arg...) do {               \
 	preempt_disable(); \
 	printk(level "%s:%d sdp_sock(%5d:%d %d:%d): " format,             \
@@ -103,7 +105,7 @@ extern int sdp_debug_level;
 	if (!atomic_read(&(sk)->sk_refcnt)) {\
 		sdp_warn(sk, "%s:%d - %s (%s) ref = 0.\n", \
 				 __func__, __LINE__, #sock_op, msg); \
-		WARN_ON(1); \
+		SDP_WARN_ON(1); \
 	} else { \
 		sdp_dbg(sk, "%s:%d - %s (%s) ref = %d.\n", __func__, __LINE__, \
 			#sock_op, msg, atomic_read(&(sk)->sk_refcnt)); \
diff --git a/drivers/infiniband/ulp/sdp/sdp_main.c b/drivers/infiniband/ulp/sdp/sdp_main.c
index f751bc2a490c8..51ee856ab49f8 100644
--- a/drivers/infiniband/ulp/sdp/sdp_main.c
+++ b/drivers/infiniband/ulp/sdp/sdp_main.c
@@ -2246,7 +2246,7 @@ sdp_mid_data:
 					goto skb_cleanup;
 			}
 
-			WARN_ON(h->mid == SDP_MID_SRCAVAIL);
+			SDP_WARN_ON(h->mid == SDP_MID_SRCAVAIL);
 
 			skb = skb->next;
 		} while (skb != (struct sk_buff *)&sk->sk_receive_queue);
diff --git a/drivers/infiniband/ulp/sdp/sdp_rx.c b/drivers/infiniband/ulp/sdp/sdp_rx.c
index 8f7fbd3d6e394..d85210532d8a4 100644
--- a/drivers/infiniband/ulp/sdp/sdp_rx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_rx.c
@@ -430,7 +430,7 @@ static int sdp_process_rx_ctl_skb(struct sdp_sock *ssk, struct sk_buff *skb)
 	switch (h->mid) {
 	case SDP_MID_DATA:
 	case SDP_MID_SRCAVAIL:
-		WARN_ON(!(sk->sk_shutdown & RCV_SHUTDOWN));
+		SDP_WARN_ON(!(sk->sk_shutdown & RCV_SHUTDOWN));
 
 		sdp_dbg(sk, "DATA after socket rcv was shutdown\n");
 
@@ -915,5 +915,5 @@ void sdp_rx_ring_destroy(struct sdp_sock *ssk)
 		}
 	}
 
-	WARN_ON(ring_head(ssk->rx_ring) != ring_tail(ssk->rx_ring));
+	SDP_WARN_ON(ring_head(ssk->rx_ring) != ring_tail(ssk->rx_ring));
 }
diff --git a/drivers/infiniband/ulp/sdp/sdp_tx.c b/drivers/infiniband/ulp/sdp/sdp_tx.c
index 1d8d7dc47b48e..fbbc2d4284641 100644
--- a/drivers/infiniband/ulp/sdp/sdp_tx.c
+++ b/drivers/infiniband/ulp/sdp/sdp_tx.c
@@ -90,7 +90,7 @@ void sdp_post_send(struct sdp_sock *ssk, struct sk_buff *skb)
 		if (ssk->tx_sa != tx_sa) {
 			sdp_dbg_data(&ssk->isk.sk, "SrcAvail cancelled "
 					"before being sent!\n");
-			WARN_ON(1);
+			SDP_WARN_ON(1);
 			__kfree_skb(skb);
 			return;
 		}
@@ -532,5 +532,5 @@ void sdp_tx_ring_destroy(struct sdp_sock *ssk)
 		}
 	}
 
-	WARN_ON(ring_head(ssk->tx_ring) != ring_tail(ssk->tx_ring));
+	SDP_WARN_ON(ring_head(ssk->tx_ring) != ring_tail(ssk->tx_ring));
 }
diff --git a/drivers/infiniband/ulp/sdp/sdp_zcopy.c b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
index 7b9a6c497076a..36660ed03439a 100644
--- a/drivers/infiniband/ulp/sdp/sdp_zcopy.c
+++ b/drivers/infiniband/ulp/sdp/sdp_zcopy.c
@@ -55,7 +55,7 @@ static int sdp_post_srcavail(struct sock *sk, struct tx_srcavail_state *tx_sa)
 	int off, len;
 	struct ib_umem_chunk *chunk;
 
-	WARN_ON(ssk->tx_sa);
+	SDP_WARN_ON(ssk->tx_sa);
 
 	BUG_ON(!tx_sa);
 	BUG_ON(!tx_sa->fmr || !tx_sa->fmr->fmr->lkey);
@@ -257,7 +257,7 @@ static void sdp_wait_rdma_wr_finished(struct sdp_sock *ssk)
 
 		if (!timeo) {
 			sdp_warn(sk, "Panic: Timed out waiting for RDMA read\n");
-			WARN_ON(1);
+			SDP_WARN_ON(1);
 			break;
 		}
 
@@ -560,7 +560,7 @@ int sdp_rdma_to_iovec(struct sock *sk, struct iovec *iov, struct sk_buff *skb,
 
 	if (len > rx_sa->len) {
 		sdp_warn(sk, "len:0x%x > rx_sa->len: 0x%x\n", len, rx_sa->len);
-		WARN_ON(1);
+		SDP_WARN_ON(1);
 		len = rx_sa->len;
 	}