mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
Revert "Cleanup: Delete dead code from send_merge_thread()"
This reverts commit fb823de9f
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
This commit is contained in:
parent
5f0a48c7c9
commit
82ad2a06ac
@ -1586,8 +1586,9 @@ send_merge_thread(void *arg)
|
||||
}
|
||||
range_free(front_ranges[i]);
|
||||
}
|
||||
ASSERT3P(range, !=, NULL);
|
||||
ASSERT3S(range->eos_marker, ==, B_TRUE);
|
||||
if (range == NULL)
|
||||
range = kmem_zalloc(sizeof (*range), KM_SLEEP);
|
||||
range->eos_marker = B_TRUE;
|
||||
bqueue_enqueue_flush(&smt_arg->q, range, 1);
|
||||
spl_fstrans_unmark(cookie);
|
||||
thread_exit();
|
||||
|
Loading…
Reference in New Issue
Block a user