X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fdsl_scan.c;h=525832b452feeea4df82a915e0c2dfd8275d0bda;hb=47050a88ac1445f3557030d0d7e61b8a397a5476;hp=7e6be15a0564acd6b004909234b4ac8feb16e780;hpb=d6320ddb78fa89c4d0fc2af00ae53c7c70992f96;p=zfs.git

diff --git a/module/zfs/dsl_scan.c b/module/zfs/dsl_scan.c
index 7e6be15..525832b 100644
--- a/module/zfs/dsl_scan.c
+++ b/module/zfs/dsl_scan.c
@@ -792,18 +792,21 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
 {
 	dsl_pool_t *dp = scn->scn_dp;
 	arc_buf_t *buf = NULL;
-	blkptr_t bp_toread = *bp;
+	blkptr_t *bp_toread;
+
+	bp_toread = kmem_alloc(sizeof (blkptr_t), KM_SLEEP);
+	*bp_toread = *bp;
 
 	/* ASSERT(pbuf == NULL || arc_released(pbuf)); */
 
 	if (dsl_scan_check_pause(scn, zb))
-		return;
+		goto out;
 
 	if (dsl_scan_check_resume(scn, dnp, zb))
-		return;
+		goto out;
 
 	if (bp->blk_birth == 0)
-		return;
+		goto out;
 
 	scn->scn_visited_this_txg++;
 
@@ -814,7 +817,7 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
 	    pbuf, bp);
 
 	if (bp->blk_birth <= scn->scn_phys.scn_cur_min_txg)
-		return;
+		goto out;
 
 	if (BP_GET_TYPE(bp) != DMU_OT_USERGROUP_USED) {
 		/*
@@ -829,12 +832,12 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
 		 * it (original untranslated -> translations from
 		 * deleted snap -> now).
 		 */
-		bp_toread = *bp;
+		*bp_toread = *bp;
 	}
 
-	if (dsl_scan_recurse(scn, ds, ostype, dnp, &bp_toread, zb, tx,
+	if (dsl_scan_recurse(scn, ds, ostype, dnp, bp_toread, zb, tx,
 	    &buf) != 0)
-		return;
+		goto out;
 
 	/*
 	 * If dsl_scan_ddt() has aready visited this block, it will have
@@ -844,7 +847,7 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
 	if (ddt_class_contains(dp->dp_spa,
 	    scn->scn_phys.scn_ddt_class_max, bp)) {
 		ASSERT(buf == NULL);
-		return;
+		goto out;
 	}
 
 	/*
@@ -859,6 +862,8 @@ dsl_scan_visitbp(blkptr_t *bp, const zbookmark_t *zb,
 	}
 	if (buf)
 		(void) arc_buf_remove_ref(buf, &buf);
+out:
+	kmem_free(bp_toread, sizeof(blkptr_t));
 }
 
 static void
@@ -1251,10 +1256,12 @@ static void
 dsl_scan_ddt(dsl_scan_t *scn, dmu_tx_t *tx)
 {
 	ddt_bookmark_t *ddb = &scn->scn_phys.scn_ddt_bookmark;
-	ddt_entry_t dde = { 0 };
+	ddt_entry_t dde;
 	int error;
 	uint64_t n = 0;
 
+	bzero(&dde, sizeof (ddt_entry_t));
+
 	while ((error = ddt_walk(scn->scn_dp->dp_spa, ddb, &dde)) == 0) {
 		ddt_t *ddt;