From 32ce8d6b731696e6c2c943519e343ff4ad767c95 Mon Sep 17 00:00:00 2001 From: liangzhen Date: Wed, 7 Jan 2009 07:30:46 +0000 Subject: [PATCH] Branch b1_x . Fix for hitting ASSERTION(tx->tx_queued) in o2iblnd . Enable neterror by default b=17780 i=isaac i=maxim --- lnet/klnds/o2iblnd/o2iblnd_cb.c | 6 +++--- lnet/libcfs/debug.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index 7bef169..8851a32 100644 --- 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); } - + tx->tx_status = -ECONNABORTED; - tx->tx_queued = 0; tx->tx_waiting = 0; - + if (tx->tx_sending == 0) { + tx->tx_queued = 0; list_del (&tx->tx_list); list_add (&tx->tx_list, &zombies); } diff --git a/lnet/libcfs/debug.c b/lnet/libcfs/debug.c index 1f61363..d90f697 100644 --- a/lnet/libcfs/debug.c +++ b/lnet/libcfs/debug.c @@ -68,7 +68,7 @@ CFS_MODULE_PARM(libcfs_debug_mb, "i", int, 0644, "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); -- 1.8.3.1