From dcc1a09b7ca467ac60e83722e1fa5417e9450f3d Mon Sep 17 00:00:00 2001
From: pjkirner <pjkirner>
Date: Thu, 22 Sep 2005 03:23:27 +0000
Subject: [PATCH] * Fixed asserts

---
 lnet/lnet/api-ni.c   |  1 -
 lnet/lnet/lib-move.c | 16 +++++-----------
 lnet/lnet/lib-msg.c  |  6 +++++-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index d19de4f..01ac73b 100644
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -764,7 +764,6 @@ lnet_shutdown_lndnis (void)
 
                 islo = ni->ni_lnd->lnd_type == LOLND;
 
-                LASSERT (!in_interrupt());
                 LASSERT (!irqs_disabled ());
                 (ni->ni_lnd->lnd_shutdown)(ni);
 
diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index fbd98c2..bd03365 100644
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -442,7 +442,6 @@ lnet_copy_kiov2kiov (unsigned int ndiov, lnet_kiov_t *diov, unsigned int doffset
         if (nob == 0)
                 return;
 
-        LASSERT (!in_interrupt ());
         LASSERT (!irqs_disabled ());
 
         LASSERT (ndiov > 0);
@@ -521,7 +520,6 @@ lnet_copy_kiov2iov (unsigned int niov, struct iovec *iov, unsigned int iovoffset
         if (nob == 0)
                 return;
 
-        LASSERT (!in_interrupt ());
         LASSERT (!irqs_disabled ());
 
         LASSERT (niov > 0);
@@ -589,7 +587,6 @@ lnet_copy_iov2kiov (unsigned int nkiov, lnet_kiov_t *kiov, unsigned int kiovoffs
         if (nob == 0)
                 return;
 
-        LASSERT (!in_interrupt ());
         LASSERT (!irqs_disabled ());
 
         LASSERT (nkiov > 0);
@@ -702,9 +699,8 @@ lnet_ni_recv(lnet_ni_t *ni, void *private, lnet_msg_t *msg, int delayed,
         struct iovec *iov = NULL;
         lnet_kiov_t  *kiov = NULL;
         int           rc;
-        
-        LASSERT (!in_interrupt());      
-        LASSERT (!irqs_disabled ());  
+
+        LASSERT (!irqs_disabled ());
         LASSERT (mlen == 0 || msg != NULL);
         
         if (msg != NULL) {
@@ -796,9 +792,8 @@ lnet_ni_send(lnet_ni_t *ni, lnet_msg_t *msg)
         int     recv = msg->msg_recvaftersend;
         int     delayed = msg->msg_delayed;
         int     rc;
-
-        LASSERT (!in_interrupt());  
-        LASSERT (!irqs_disabled ());      
+
+        LASSERT (!irqs_disabled ());
 
         /* On GET, call lnet_ni_recv() right after the send. The recv gets
          * delayed until after the send to ensure the LND still has any RDMA
@@ -1689,9 +1684,8 @@ lnet_parse(lnet_ni_t *ni, lnet_hdr_t *hdr, lnet_nid_t from_nid, void *private)
         __u32          payload_length;
         __u32          type;
 
-        LASSERT (!in_interrupt());
         LASSERT (!irqs_disabled ());
-        
+
         type = le32_to_cpu(hdr->type);
         src_nid = le64_to_cpu(hdr->src_nid);
         dest_nid = le64_to_cpu(hdr->dest_nid);
diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c
index 0482e9a..5add0df 100644
--- a/lnet/lnet/lib-msg.c
+++ b/lnet/lnet/lib-msg.c
@@ -69,7 +69,7 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status)
         int                unlink;
         int                rc;
 
-        LASSERT (!in_interrupt());
+        LASSERT (!irqs_disabled ());
 
         if (msg == NULL)
                 return;
@@ -143,7 +143,9 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status)
                 msg->msg_hdr.msg.ack.match_bits = msg->msg_ev.match_bits;
                 msg->msg_hdr.msg.ack.mlength = cpu_to_le32(msg->msg_ev.mlength);
                 
+                LASSERT(!irqs_disabled());
                 rc = lnet_send(ni, msg);
+                LASSERT(!irqs_disabled());
                 if (rc == 0)
                         return;
 
@@ -156,7 +158,9 @@ lnet_finalize (lnet_ni_t *ni, lnet_msg_t *msg, int status)
         
                 LNET_UNLOCK();
                 
+                LASSERT(!irqs_disabled());
                 rc = lnet_send(NULL, msg);
+                LASSERT(!irqs_disabled());
                 if (rc == 0)
                         return;
 
-- 
1.8.3.1