Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent

This commit is contained in:
Brian Behlendorf 2009-01-13 14:18:38 -08:00
commit 46f64b1f20
1 changed files with 5 additions and 0 deletions

View File

@ -488,9 +488,14 @@ zil_rollback_destroy(zilog_t *zilog, dmu_tx_t *tx)
/* /*
* Ensure there's no outstanding ZIL IO. No lwbs or just the * Ensure there's no outstanding ZIL IO. No lwbs or just the
* unused one that allocated in advance is ok. * unused one that allocated in advance is ok.
*
* XXX: The assertion is correct, but we need a portable version
* which does not rely on directly accessing the list nodes.
*/ */
#if 0
ASSERT(zilog->zl_lwb_list.list_head.list_next == ASSERT(zilog->zl_lwb_list.list_head.list_next ==
zilog->zl_lwb_list.list_head.list_prev); zilog->zl_lwb_list.list_head.list_prev);
#endif
(void) zil_parse(zilog, zil_free_log_block, zil_free_log_record, (void) zil_parse(zilog, zil_free_log_block, zil_free_log_record,
tx, zh->zh_claim_txg); tx, zh->zh_claim_txg);
} }