Fix style issue, attempt to debug zfstest failure

Signed-off-by: Paul Dagnelie <pcd@delphix.com>
openzfs · Jul 10, 2018 · c43d8e4 · c43d8e4
1 parent 0491244
commit c43d8e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/module/zfs/zil.c b/module/zfs/zil.c
@@ -1393,8 +1393,8 @@ zil_lwb_write_issue(zilog_t *zilog, lwb_t *lwb)
 	zilog->zl_prev_rotor = (zilog->zl_prev_rotor + 1) & (ZIL_PREV_BLKS - 1);
 
 	BP_ZERO(bp);
-	error = zio_alloc_zil(spa, zilog->zl_os, txg, bp, &lwb->lwb_blk, zil_blksz,
-	     &slog);
+	error = zio_alloc_zil(spa, zilog->zl_os, txg, bp, &lwb->lwb_blk,
+	    zil_blksz, &slog);
 	if (slog) {
 		ZIL_STAT_BUMP(zil_itx_metaslab_slog_count);
 		ZIL_STAT_INCR(zil_itx_metaslab_slog_bytes, lwb->lwb_nused);

diff --git a/tests/zfs-tests/tests/functional/reservation/reservation_004_pos.sh b/tests/zfs-tests/tests/functional/reservation/reservation_004_pos.sh
@@ -114,6 +114,13 @@ for obj in $OBJ_LIST ; do
 
 	log_must_busy zfs destroy -f $obj
 
+	t0=$SECONDS
+	# Wait for everything to be freed.
+	while [[ "0" != "$(zpool list -Ho freeing $TESTPOOL)" ]]; do
+		[[ $((SECONDS - t0)) -gt 180 ]] && \
+		    log_fail "Timed out waiting for freeing to drop to zero"
+		sleep 1
+	done
 	new_space_avail=`get_prop available $TESTPOOL`
 	new_space_used=`get_prop used $TESTPOOL`