|
 |
1bdc94 |
From 4dc02d3f416a291b48e803600302e69cbb6f92ff Mon Sep 17 00:00:00 2001
|
|
|
1bdc94 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Date: Tue, 26 Jun 2018 09:47:49 +0200
|
|
|
1bdc94 |
Subject: [PATCH 20/89] blockjob: drop block_job_pause/resume_all()
|
|
|
1bdc94 |
|
|
|
1bdc94 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Message-id: <20180626094856.6924-7-kwolf@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81068
|
|
|
1bdc94 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 06/73] blockjob: drop block_job_pause/resume_all()
|
|
|
1bdc94 |
Bugzilla: 1513543
|
|
|
1bdc94 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
1bdc94 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
From: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Commit 8119334918e86f45877cfc139192d54f2449a239 ("block: Don't
|
|
|
1bdc94 |
block_job_pause_all() in bdrv_drain_all()") removed the only callers of
|
|
|
1bdc94 |
block_job_pause/resume_all().
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Pausing and resuming now happens in child_job_drained_begin/end() so
|
|
|
1bdc94 |
it's no longer necessary to globally pause/resume jobs.
|
|
|
1bdc94 |
|
|
|
1bdc94 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
1bdc94 |
Reviewed-by: Alberto Garcia <berto@igalia.com>
|
|
|
1bdc94 |
Message-id: 20180424085240.5798-1-stefanha@redhat.com
|
|
|
1bdc94 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
1bdc94 |
(cherry picked from commit 23d702d898bdd8e6772d83ea9789767ed589e17e)
|
|
|
1bdc94 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
1bdc94 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
1bdc94 |
---
|
|
|
1bdc94 |
blockjob.c | 27 ---------------------------
|
|
|
1bdc94 |
include/block/blockjob_int.h | 14 --------------
|
|
|
1bdc94 |
2 files changed, 41 deletions(-)
|
|
|
1bdc94 |
|
|
|
1bdc94 |
diff --git a/blockjob.c b/blockjob.c
|
|
|
1bdc94 |
index 7064389..b39d0f8 100644
|
|
|
1bdc94 |
--- a/blockjob.c
|
|
|
1bdc94 |
+++ b/blockjob.c
|
|
|
1bdc94 |
@@ -996,19 +996,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
|
|
|
1bdc94 |
return job;
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-void block_job_pause_all(void)
|
|
|
1bdc94 |
-{
|
|
|
1bdc94 |
- BlockJob *job = NULL;
|
|
|
1bdc94 |
- while ((job = block_job_next(job))) {
|
|
|
1bdc94 |
- AioContext *aio_context = blk_get_aio_context(job->blk);
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
- aio_context_acquire(aio_context);
|
|
|
1bdc94 |
- block_job_ref(job);
|
|
|
1bdc94 |
- block_job_pause(job);
|
|
|
1bdc94 |
- aio_context_release(aio_context);
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
-}
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
void block_job_early_fail(BlockJob *job)
|
|
|
1bdc94 |
{
|
|
|
1bdc94 |
assert(job->status == BLOCK_JOB_STATUS_CREATED);
|
|
|
1bdc94 |
@@ -1086,20 +1073,6 @@ void coroutine_fn block_job_pause_point(BlockJob *job)
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
}
|
|
|
1bdc94 |
|
|
|
1bdc94 |
-void block_job_resume_all(void)
|
|
|
1bdc94 |
-{
|
|
|
1bdc94 |
- BlockJob *job, *next;
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
- QLIST_FOREACH_SAFE(job, &block_jobs, job_list, next) {
|
|
|
1bdc94 |
- AioContext *aio_context = blk_get_aio_context(job->blk);
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
- aio_context_acquire(aio_context);
|
|
|
1bdc94 |
- block_job_resume(job);
|
|
|
1bdc94 |
- block_job_unref(job);
|
|
|
1bdc94 |
- aio_context_release(aio_context);
|
|
|
1bdc94 |
- }
|
|
|
1bdc94 |
-}
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
/*
|
|
|
1bdc94 |
* Conditionally enter a block_job pending a call to fn() while
|
|
|
1bdc94 |
* under the block_job_lock critical section.
|
|
|
1bdc94 |
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
|
|
|
1bdc94 |
index 642adce..d5a515d 100644
|
|
|
1bdc94 |
--- a/include/block/blockjob_int.h
|
|
|
1bdc94 |
+++ b/include/block/blockjob_int.h
|
|
|
1bdc94 |
@@ -169,20 +169,6 @@ void block_job_sleep_ns(BlockJob *job, int64_t ns);
|
|
|
1bdc94 |
void block_job_yield(BlockJob *job);
|
|
|
1bdc94 |
|
|
|
1bdc94 |
/**
|
|
|
1bdc94 |
- * block_job_pause_all:
|
|
|
1bdc94 |
- *
|
|
|
1bdc94 |
- * Asynchronously pause all jobs.
|
|
|
1bdc94 |
- */
|
|
|
1bdc94 |
-void block_job_pause_all(void);
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
-/**
|
|
|
1bdc94 |
- * block_job_resume_all:
|
|
|
1bdc94 |
- *
|
|
|
1bdc94 |
- * Resume all block jobs. Must be paired with a preceding block_job_pause_all.
|
|
|
1bdc94 |
- */
|
|
|
1bdc94 |
-void block_job_resume_all(void);
|
|
|
1bdc94 |
-
|
|
|
1bdc94 |
-/**
|
|
|
1bdc94 |
* block_job_early_fail:
|
|
|
1bdc94 |
* @bs: The block device.
|
|
|
1bdc94 |
*
|
|
|
1bdc94 |
--
|
|
|
1bdc94 |
1.8.3.1
|
|
|
1bdc94 |
|