WIP, draft (unfinished work)

5960 zfs recv should prefetch indirect blocks 5925 zfs receive -o origin= Reviewed by: Prakash Surya <[email protected]> Reviewed by: Matthew Ahrens <[email protected]> depends on openzfs#3574 Illumos 5745 zfs set allows only one dataset property to be set at a time depends on openzfs#3611 Illumos 5746 more checksumming in zfs send diverged code base from Illumos: fc5bb51 Fix stack dbuf_hold_impl() 34229a2 Reduce stack usage for recursive traverse_visitbp() 0f37d0c Linux 3.11 compat: fops->iterate() [module/zfs/zfs_vnops.c] module/zfs/dmu.c (c90 vs. c99) 37abac6 Illumos openzfs#2703: add mechanism to report ZFS send progress [module/zfs/dmu_send.c]
kernelOfTruth · Dec 22, 2015 · e64383b · e64383b
1 parent b7d2064
commit e64383b
Show file tree

Hide file tree

Showing 68 changed files with 71,272 additions and 210 deletions.
diff --git a/cmd/zdb/zdb.c b/cmd/zdb/zdb.c
@@ -2480,6 +2480,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	dmu_object_type_t type;
 	boolean_t is_metadata;
 
+	if (bp == NULL)
+		return (0);
+
 	if (dump_opt['b'] >= 5 && bp->blk_birth > 0) {
 		char blkbuf[BP_SPRINTF_LEN];
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), bp);
@@ -2976,7 +2979,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 	avl_index_t where;
 	zdb_ddt_entry_t *zdde, zdde_search;
 
-	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
+	if (bp == NULL || BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) {