Serialize ZTHR operations to eliminate races

[mirror_zfs.git] / module / zfs / spa_checkpoint.c

diff --git a/module/zfs/spa_checkpoint.c b/module/zfs/spa_checkpoint.c
index 863ec46b1fad8123975df3ea939a23c07d7823d8..230ae5785a854638bbcff3951ab1b51f46bd37e7 100644 (file)
--- a/module/zfs/spa_checkpoint.c
+++ b/module/zfs/spa_checkpoint.c
@@ -393,7 +393,7 @@ spa_checkpoint_discard_thread_check(void *arg, zthr_t *zthr)
        return (B_TRUE);
 }
 
-int
+void
 spa_checkpoint_discard_thread(void *arg, zthr_t *zthr)
 {
        spa_t *spa = arg;
@@ -408,7 +408,7 @@ spa_checkpoint_discard_thread(void *arg, zthr_t *zthr)
                        dmu_buf_t **dbp;
 
                        if (zthr_iscancelled(zthr))
-                               return (0);
+                               return;
 
                        ASSERT3P(vd->vdev_ops, !=, &vdev_indirect_ops);
 
@@ -445,8 +445,6 @@ spa_checkpoint_discard_thread(void *arg, zthr_t *zthr)
        VERIFY0(dsl_sync_task(spa->spa_name, NULL,
            spa_checkpoint_discard_complete_sync, spa,
            0, ZFS_SPACE_CHECK_NONE));
-
-       return (0);
 }