* Removed misleading comment about the # of tx descs

*   Don't force FMR unmap on error if it wasn't mapped in the first place.

diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h
index 6898fdf..c0be15e 100644 (file)
--- a/lnet/klnds/viblnd/viblnd.h
+++ b/lnet/klnds/viblnd/viblnd.h
@@ -131,8 +131,6 @@
 
 #define IBNAL_NTX                 64            /* # tx descs */
 #define IBNAL_NTX_NBLK            128           /* # reserved tx descs */
-/* reduced from 256 to ensure we register < 255 pages per region.  
- * this can change if we register all memory. */
 
 #define IBNAL_PEER_HASH_SIZE      101           /* # peer lists */
 

diff --git a/lnet/klnds/viblnd/viblnd_cb.c b/lnet/klnds/viblnd/viblnd_cb.c
index 6df0d52..139c5ea 100644 (file)
--- a/lnet/klnds/viblnd/viblnd_cb.c
+++ b/lnet/klnds/viblnd/viblnd_cb.c
@@ -37,7 +37,7 @@ kibnal_tx_done (kib_tx_t *tx)
 
 #if IBNAL_USE_FMR
         if (tx->tx_md.md_fmrcount == 0 ||
-            ptlrc != PTL_OK) {
+            (ptlrc != PTL_OK && tx->tx_md.md_active)) {
                 vv_return_t      vvrc;
 
                 /* mapping must be active (it dropped fmrcount to 0) */