UBUNTU: SAUCE: (noup) Update spl to 0.7.3-1ubuntu1, zfs to 0.7.3-1ubuntu1

[mirror_ubuntu-bionic-kernel.git] / zfs / module / zfs / bptree.c

diff --git a/zfs/module/zfs/bptree.c b/zfs/module/zfs/bptree.c
index 9f62d7b911f361ea2397bd9f96c4a756b883d6c5..6cd2b019f742380000267c4c6981f2033de7bd75 100644 (file)
--- a/zfs/module/zfs/bptree.c
+++ b/zfs/module/zfs/bptree.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  */
 
 #include <sys/arc.h>
@@ -156,7 +156,7 @@ bptree_visit_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
        int err;
        struct bptree_args *ba = arg;
 
-       if (BP_IS_HOLE(bp))
+       if (bp == NULL || BP_IS_HOLE(bp))
                return (0);
 
        err = ba->ba_func(ba->ba_arg, bp, ba->ba_tx);
@@ -223,7 +223,8 @@ bptree_iterate(objset_t *os, uint64_t obj, boolean_t free, bptree_itor_t func,
                        flags |= TRAVERSE_HARD;
                zfs_dbgmsg("bptree index %lld: traversing from min_txg=%lld "
                    "bookmark %lld/%lld/%lld/%lld",
-                   i, (longlong_t)bte.be_birth_txg,
+                   (longlong_t)i,
+                   (longlong_t)bte.be_birth_txg,
                    (longlong_t)bte.be_zb.zb_objset,
                    (longlong_t)bte.be_zb.zb_object,
                    (longlong_t)bte.be_zb.zb_level,