Skip to content

Commit 82ad2a0

Browse files
authored
Revert "Cleanup: Delete dead code from send_merge_thread()"
This reverts commit fb823de due to a regression. It is in fact possible for the range->eos_marker to be false on error. Reviewed-by: Richard Yao <richard.yao@alumni.stonybrook.edu> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Issue #14042 Closes #14104
1 parent 5f0a48c commit 82ad2a0

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

module/zfs/dmu_send.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1586,8 +1586,9 @@ send_merge_thread(void *arg)
15861586
}
15871587
range_free(front_ranges[i]);
15881588
}
1589-
ASSERT3P(range, !=, NULL);
1590-
ASSERT3S(range->eos_marker, ==, B_TRUE);
1589+
if (range == NULL)
1590+
range = kmem_zalloc(sizeof (*range), KM_SLEEP);
1591+
range->eos_marker = B_TRUE;
15911592
bqueue_enqueue_flush(&smt_arg->q, range, 1);
15921593
spl_fstrans_unmark(cookie);
15931594
thread_exit();

0 commit comments

Comments
 (0)