Branch HEAD

. Fix for hitting ASSERTION(tx->tx_queued) in o2iblnd
. Enable neterror by default

b=17780
i=isaac
i=maxim

diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
index 0728759..4c950c8 100644 (file)
--- a/libcfs/libcfs/debug.c
+++ b/libcfs/libcfs/debug.c
@@ -65,7 +65,7 @@ CFS_MODULE_PARM(libcfs_debug_mb, "i", int, 0644,
                 "Total debug buffer size.");
 EXPORT_SYMBOL(libcfs_debug_mb);
 
                 "Total debug buffer size.");
 EXPORT_SYMBOL(libcfs_debug_mb);
 

-unsigned int libcfs_printk = D_CANTMASK;
+unsigned int libcfs_printk = (D_CANTMASK | D_NETERROR);

 CFS_MODULE_PARM(libcfs_printk, "i", uint, 0644,
                 "Lustre kernel debug console mask");
 EXPORT_SYMBOL(libcfs_printk);
 CFS_MODULE_PARM(libcfs_printk, "i", uint, 0644,
                 "Lustre kernel debug console mask");
 EXPORT_SYMBOL(libcfs_printk);

diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 7bef169..8851a32 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -2022,12 +2022,12 @@ kiblnd_abort_txs(kib_conn_t *conn, struct list_head *txs)
                 } else {
                         LASSERT (tx->tx_queued);
                 }
                 } else {
                         LASSERT (tx->tx_queued);
                 }

-                
+

                 tx->tx_status = -ECONNABORTED;
                 tx->tx_status = -ECONNABORTED;

-                tx->tx_queued = 0;

                 tx->tx_waiting = 0;
                 tx->tx_waiting = 0;

-                
+

                 if (tx->tx_sending == 0) {
                 if (tx->tx_sending == 0) {

+                        tx->tx_queued = 0;

                         list_del (&tx->tx_list);
                         list_add (&tx->tx_list, &zombies);
                 }
                         list_del (&tx->tx_list);
                         list_add (&tx->tx_list, &zombies);
                 }