From: Tom Caputi <tcaputi@datto.com>
Date: Thu, 11 Oct 2018 20:38:27 +0000 (-0400)
Subject: Fix ASSERT in zil_create() during ztest
X-Git-Tag: zfs-0.8.0~334
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c04812f964a2a79ec501fb1ba995ef333ff79172;p=mirror_zfs.git

Fix ASSERT in zil_create() during ztest

This patch corrects an ASSERT in zil_create() that will only be
true if the call to zio_alloc_zil() does not fail.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #8010
---

diff --git a/module/zfs/zil.c b/module/zfs/zil.c
index e247c1e4f..d5ebf7561 100644
--- a/module/zfs/zil.c
+++ b/module/zfs/zil.c
@@ -720,7 +720,8 @@ zil_create(zilog_t *zilog)
 		txg_wait_synced(zilog->zl_dmu_pool, txg);
 	}
 
-	ASSERT(bcmp(&blk, &zh->zh_log, sizeof (blk)) == 0);
+	ASSERT(error != 0 || bcmp(&blk, &zh->zh_log, sizeof (blk)) == 0);
+	IMPLY(error == 0, lwb != NULL);
 
 	return (lwb);
 }