[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 38/50] block/mirror.c: use of job helpers in drivers
From: |
Kevin Wolf |
Subject: |
[PULL 38/50] block/mirror.c: use of job helpers in drivers |
Date: |
Fri, 7 Oct 2022 12:47:40 +0200 |
From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Once job lock is used and aiocontext is removed, mirror has
to perform job operations under the same critical section,
Note: at this stage, job_{lock/unlock} and job lock guard macros
are *nop*.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-11-eesposit@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/mirror.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 3c4ab1159d..c6bf7f40ce 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1152,8 +1152,10 @@ static void mirror_complete(Job *job, Error **errp)
s->should_complete = true;
/* If the job is paused, it will be re-entered when it is resumed */
- if (!job->paused) {
- job_enter(job);
+ WITH_JOB_LOCK_GUARD() {
+ if (!job->paused) {
+ job_enter_cond_locked(job, NULL);
+ }
}
}
@@ -1173,8 +1175,11 @@ 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 && !job_is_cancelled(&job->job) && !s->in_drain)
{
- return true;
+ WITH_JOB_LOCK_GUARD() {
+ if (!s->common.job.paused && !job_is_cancelled_locked(&job->job)
+ && !s->in_drain) {
+ return true;
+ }
}
return !!s->in_flight;
--
2.37.3
- [PULL 09/50] file-posix: add missing coroutine_fn annotations, (continued)
- [PULL 09/50] file-posix: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 14/50] parallels: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 39/50] jobs: group together API calls under the same job lock, Kevin Wolf, 2022/10/07
- [PULL 42/50] blockjob.h: categorize fields in struct BlockJob, Kevin Wolf, 2022/10/07
- [PULL 10/50] iscsi: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 18/50] qed: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 16/50] copy-before-write: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 29/50] job.c: make job_mutex and job_lock/unlock() public, Kevin Wolf, 2022/10/07
- [PULL 35/50] blockjob: introduce block_job _locked() APIs, Kevin Wolf, 2022/10/07
- [PULL 24/50] raw-format: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07
- [PULL 38/50] block/mirror.c: use of job helpers in drivers,
Kevin Wolf <=
- [PULL 36/50] jobs: add job lock in find_* functions, Kevin Wolf, 2022/10/07
- [PULL 40/50] job: detect change of aiocontext within job coroutine, Kevin Wolf, 2022/10/07
- [PULL 50/50] file-posix: Remove unused s->discard_zeroes, Kevin Wolf, 2022/10/07
- [PULL 49/50] job: remove unused functions, Kevin Wolf, 2022/10/07
- [PULL 43/50] blockjob: rename notifier callbacks as _locked, Kevin Wolf, 2022/10/07
- [PULL 47/50] block_job_query: remove atomic read, Kevin Wolf, 2022/10/07
- [PULL 46/50] job.c: enable job lock/unlock and remove Aiocontext locks, Kevin Wolf, 2022/10/07
- [PULL 45/50] job.h: categorize JobDriver callbacks that need the AioContext lock, Kevin Wolf, 2022/10/07
- [PULL 30/50] job.h: categorize fields in struct Job, Kevin Wolf, 2022/10/07
- [PULL 20/50] throttle: add missing coroutine_fn annotations, Kevin Wolf, 2022/10/07