Land b_release_1_4_3 onto HEAD (20050619_0305)

[fs/lustre-release.git] / lnet / klnds / ralnd / ralnd.c

diff --git a/lnet/klnds/ralnd/ralnd.c b/lnet/klnds/ralnd/ralnd.c
index e532ea3..f984e6f 100644 (file)
--- a/lnet/klnds/ralnd/ralnd.c
+++ b/lnet/klnds/ralnd/ralnd.c
@@ -920,7 +920,7 @@ kranal_conn_handshake (struct socket *sock, kra_peer_t *peer)
         if (nstale != 0)
                 CWARN("Closed %d stale conns to "LPX64"\n", nstale, peer_nid);
 
-        CDEBUG(D_WARNING, "New connection to "LPX64" on devid[%d] = %d\n",
+        CWARN("New connection to "LPX64" on devid[%d] = %d\n",
                peer_nid, conn->rac_device->rad_idx, conn->rac_device->rad_id);
 
         /* Ensure conn gets checked.  Transmits may have been queued and an
@@ -1865,7 +1865,11 @@ kranal_api_shutdown (nal_t *nal)
 
                 LASSERT (list_empty(&dev->rad_ready_conns));
                 LASSERT (list_empty(&dev->rad_new_conns));
-
+                LASSERT (dev->rad_nphysmap == 0);
+                LASSERT (dev->rad_nppphysmap == 0);
+                LASSERT (dev->rad_nvirtmap == 0);
+                LASSERT (dev->rad_nobvirtmap == 0);
+                
                 spin_lock_irqsave(&dev->rad_lock, flags);
                 wake_up(&dev->rad_waitq);
                 spin_unlock_irqrestore(&dev->rad_lock, flags);