[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v11 10/21] block/mirror.c: use of job helpers in drivers
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v11 10/21] block/mirror.c: use of job helpers in drivers |
Date: |
Fri, 26 Aug 2022 09:20:53 -0400 |
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>
---
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.31.1
- [PATCH v11 00/21] job: replace AioContext lock with job_mutex, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 01/21] job.c: make job_mutex and job_lock/unlock() public, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 02/21] job.h: categorize fields in struct Job, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 03/21] job.c: API functions not used outside should be static, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 08/21] jobs: add job lock in find_* functions, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 07/21] blockjob: introduce block_job _locked() APIs, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 10/21] block/mirror.c: use of job helpers in drivers,
Emanuele Giuseppe Esposito <=
- [PATCH v11 14/21] blockjob.h: categorize fields in struct BlockJob, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 05/21] job.c: add job_lock/unlock while keeping job.h intact, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 15/21] blockjob: rename notifier callbacks as _locked, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 13/21] jobs: protect job.aio_context with BQL and job_mutex, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 11/21] jobs: group together API calls under the same job lock, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 16/21] blockjob: protect iostatus field in BlockJob struct, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 17/21] job.h: categorize JobDriver callbacks that need the AioContext lock, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 20/21] blockjob: remove unused functions, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 18/21] job.c: enable job lock/unlock and remove Aiocontext locks, Emanuele Giuseppe Esposito, 2022/08/26
- [PATCH v11 06/21] job: move and update comments from blockjob.c, Emanuele Giuseppe Esposito, 2022/08/26