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 4c0c37b3737b8cdea56c767e506cb2ffece81485..a60a5c8c61d88501247a32ef227acbd4b8c77110 100644 (file)
--- 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 f751bc2a490c898c1e396c71c957ce656bfa029d..51ee856ab49f80915a4b25acc821b6682b96e809 100644 (file)
--- 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 8f7fbd3d6e394c3cf269cf73fae88ae833171a48..d85210532d8a4b393debeb10272cce2b66a7050c 100644 (file)
--- 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 1d8d7dc47b48e6987735ef31c5aa5d71eb20dc22..fbbc2d4284641fed62bae9143c8fde014053a0d1 100644 (file)
--- 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 7b9a6c497076ace039e7114924808afb92614757..36660ed03439ae7b8071de9f40e5c7a9862cc077 100644 (file)
--- 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;
        }