Matt's review comments.

skiselkov · Feb 11, 2017 · d4a1e8e · d4a1e8e
1 parent 2f86f9c
commit d4a1e8e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
@@ -48,6 +48,7 @@
 #include <zfs_prop.h>
 #include <sys/fs/zfs.h>
 #include <sys/stat.h>
+#include <sys/sysmacros.h>
 
 #include <libzfs.h>
 
@@ -57,10 +58,6 @@
 
 #include "statcommon.h"
 
-#ifndef	MAX
-#define	MAX(x, y)	((x) > (y) ? (x) : (y))
-#endif	/* MAX */
-
 static int zpool_do_create(int, char **);
 static int zpool_do_destroy(int, char **);
 
@@ -3985,9 +3982,7 @@ print_scan_status(pool_scan_stat_t *ps)
 		zfs_nicenum(proc_rate, proc_rate_buf, sizeof (proc_rate_buf));
 		(void) printf(gettext("    %s resilvered at %s/s"),
 		    processed_buf, proc_rate_buf);
-	} else if (ps->pss_func == POOL_SCAN_SCRUB ||
-	    ps->pss_func == POOL_SCAN_MOS ||
-	    ps->pss_func == POOL_SCAN_META) {
+	} else if (ps->pss_func == POOL_SCAN_SCRUB) {
 		(void) printf(gettext("    %s repaired"), processed_buf);
 	}
 

diff --git a/usr/src/uts/common/fs/zfs/dsl_scan.c b/usr/src/uts/common/fs/zfs/dsl_scan.c
@@ -178,7 +178,7 @@ typedef struct {
 
 typedef struct scan_io {
 	dva_t			sio_dva;
-	uint64_t		sio_prop;
+	uint64_t		sio_blk_prop;
 	uint64_t		sio_phys_birth;
 	uint64_t		sio_birth;
 	zio_cksum_t		sio_cksum;
@@ -262,7 +262,7 @@ sio2bp(const scan_io_t *sio, blkptr_t *bp)
 {
 	bzero(bp, sizeof (*bp));
 	bp->blk_dva[0] = sio->sio_dva;
-	bp->blk_prop = sio->sio_prop;
+	bp->blk_prop = sio->sio_blk_prop;
 	bp->blk_phys_birth = sio->sio_phys_birth;
 	bp->blk_birth = sio->sio_birth;
 	bp->blk_fill = 1;	/* we always only work with data pointers */
@@ -273,7 +273,7 @@ static inline void
 bp2sio(const blkptr_t *bp, scan_io_t *sio, int dva_i)
 {
 	sio->sio_dva = bp->blk_dva[dva_i];
-	sio->sio_prop = bp->blk_prop;
+	sio->sio_blk_prop = bp->blk_prop;
 	sio->sio_phys_birth = bp->blk_phys_birth;
 	sio->sio_birth = bp->blk_birth;
 	sio->sio_cksum = bp->blk_cksum;
@@ -1839,7 +1839,10 @@ dsl_scan_visit(dsl_scan_t *scn, dmu_tx_t *tx)
 	 */
 	bzero(&scn->scn_phys.scn_bookmark, sizeof (zbookmark_phys_t));
 
-	/* keep pulling things out of the zap-object-as-queue */
+	/*
+	 * Keep pulling things out of the dataset avl queue. Updates to the
+	 * persistent zap-object-as-queue happen only at checkpoints.
+	 */
 	for (scan_ds_t *sds = avl_first(&scn->scn_queue), *sds_next = NULL;
 	    sds != NULL; sds = sds_next) {
 		dsl_dataset_t *ds;