From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Eric Blake <eblake@redhat.com>,
qemu-devel@nongnu.org
Subject: [PATCH v4 08/12] mirror: Use job_is_cancelled()
Date: Tue, 7 Sep 2021 14:42:41 +0200 [thread overview]
Message-ID: <20210907124245.143492-9-hreitz@redhat.com> (raw)
In-Reply-To: <20210907124245.143492-1-hreitz@redhat.com>
mirror_drained_poll() returns true whenever the job is cancelled,
because "we [can] be sure that it won't issue more requests". However,
this is only true for force-cancelled jobs, so use job_is_cancelled().
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/mirror.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/block/mirror.c b/block/mirror.c
index 72e02fa34e..024fa2dcea 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1177,7 +1177,7 @@ static bool mirror_drained_poll(BlockJob *job)
* from one of our own drain sections, to avoid a deadlock waiting for
* ourselves.
*/
- if (!s->common.job.paused && !s->common.job.cancelled && !s->in_drain) {
+ if (!s->common.job.paused && !job_is_cancelled(&job->job) && !s->in_drain) {
return true;
}
--
2.31.1
next prev parent reply other threads:[~2021-09-07 13:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 12:42 [PATCH v4 00/12] mirror: Handle errors after READY cancel Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 01/12] job: Context changes in job_completed_txn_abort() Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 02/12] mirror: Keep s->synced on error Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 03/12] mirror: Drop s->synced Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 04/12] job: Force-cancel jobs in a failed transaction Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 05/12] job: @force parameter for job_cancel_sync() Hanna Reitz
2021-09-08 16:20 ` Eric Blake
2021-09-08 16:33 ` Vladimir Sementsov-Ogievskiy
2021-09-14 17:20 ` Hanna Reitz
2021-09-15 7:07 ` Vladimir Sementsov-Ogievskiy
2021-09-07 12:42 ` [PATCH v4 06/12] jobs: Give Job.force_cancel more meaning Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 07/12] job: Add job_cancel_requested() Hanna Reitz
2021-09-07 12:42 ` Hanna Reitz [this message]
2021-09-07 12:42 ` [PATCH v4 09/12] mirror: Check job_is_cancelled() earlier Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 10/12] mirror: Stop active mirroring after force-cancel Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 11/12] mirror: Do not clear .cancelled Hanna Reitz
2021-09-07 12:42 ` [PATCH v4 12/12] iotests: Add mirror-ready-cancel-error test Hanna Reitz
2021-09-15 7:45 ` [PATCH v4 00/12] mirror: Handle errors after READY cancel Vladimir Sementsov-Ogievskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210907124245.143492-9-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).