On Fri, Aug 06, 2021 at 11:38:58AM +0200, Max Reitz wrote: > Clearing .cancelled before leaving the main loop when the job has been > soft-cancelled is no longer necessary since job_is_cancelled() only > returns true for jobs that have been force-cancelled. > > Therefore, this only makes a differences in places that call > job_cancel_requested(). In block/mirror.c, this is done only before > .cancelled was cleared. > > In job.c, there are two callers: > - job_completed_txn_abort() asserts that .cancelled is true, so keeping > it true will not affect this place. > > - job_complete() refuses to let a job complete that has .cancelled set. > It is correct to refuse to let the user invoke job-complete on mirror > jobs that have already been soft-cancelled. > > With this change, there are no places that reset .cancelled to false and > so we can be sure that .force_cancel can only be true of .cancelled is
s/of/if/ > true as well. Assert this in job_is_cancelled(). > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > block/mirror.c | 2 -- > job.c | 4 +++- > 2 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
