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

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

diff --git a/zfs/module/zfs/dmu_diff.c b/zfs/module/zfs/dmu_diff.c
index 91415d0d2dcb6aa8bc17f87aaf7e3b1e140016ac..982b96132cc8f497a73820a5798c95f1c8d665e5 100644 (file)
--- a/zfs/module/zfs/dmu_diff.c
+++ b/zfs/module/zfs/dmu_diff.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  */
 
 #include <sys/dmu.h>
@@ -115,7 +115,7 @@ diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
        if (issig(JUSTLOOKING) && issig(FORREAL))
                return (SET_ERROR(EINTR));
 
-       if (zb->zb_object != DMU_META_DNODE_OBJECT)
+       if (bp == NULL || zb->zb_object != DMU_META_DNODE_OBJECT)
                return (0);
 
        if (BP_IS_HOLE(bp)) {
@@ -146,7 +146,7 @@ diff_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
                        if (err)
                                break;
                }
-               (void) arc_buf_remove_ref(abuf, &abuf);
+               arc_buf_destroy(abuf, &abuf);
                if (err)
                        return (err);
                /* Don't care about the data blocks */