[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 04/21] block/io: bdrv_wait_serialising_requests_locked: drop e
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v7 04/21] block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg |
Date: |
Wed, 21 Oct 2020 17:58:42 +0300 |
bs is linked in req, so no needs to pass it separately. Most of
tracked-requests API doesn't have bs argument. Actually, after this
patch only tracked_request_begin has it, but it's for purpose.
While being here, also add a comment about what "_locked" is.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
block/io.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/io.c b/block/io.c
index c2d9b1f849..5c1a1b388b 100644
--- a/block/io.c
+++ b/block/io.c
@@ -762,16 +762,16 @@ bdrv_find_conflicting_request(BdrvTrackedRequest *self)
return NULL;
}
+/* Called with self->bs->reqs_lock held */
static bool coroutine_fn
-bdrv_wait_serialising_requests_locked(BlockDriverState *bs,
- BdrvTrackedRequest *self)
+bdrv_wait_serialising_requests_locked(BdrvTrackedRequest *self)
{
BdrvTrackedRequest *req;
bool waited = false;
while ((req = bdrv_find_conflicting_request(self))) {
self->waiting_for = req;
- qemu_co_queue_wait(&req->wait_queue, &bs->reqs_lock);
+ qemu_co_queue_wait(&req->wait_queue, &self->bs->reqs_lock);
self->waiting_for = NULL;
waited = true;
}
@@ -795,7 +795,7 @@ bool bdrv_mark_request_serialising(BdrvTrackedRequest *req,
uint64_t align)
req->overlap_offset = MIN(req->overlap_offset, overlap_offset);
req->overlap_bytes = MAX(req->overlap_bytes, overlap_bytes);
- waited = bdrv_wait_serialising_requests_locked(bs, req);
+ waited = bdrv_wait_serialising_requests_locked(req);
qemu_co_mutex_unlock(&bs->reqs_lock);
return waited;
}
@@ -877,7 +877,7 @@ static bool coroutine_fn
bdrv_wait_serialising_requests(BdrvTrackedRequest *self
}
qemu_co_mutex_lock(&bs->reqs_lock);
- waited = bdrv_wait_serialising_requests_locked(bs, self);
+ waited = bdrv_wait_serialising_requests_locked(self);
qemu_co_mutex_unlock(&bs->reqs_lock);
return waited;
--
2.21.3
- [PATCH v7 00/21] preallocate filter, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 02/21] block/io.c: drop assertion on double waiting for request serialisation, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 01/21] block: simplify comment to BDRV_REQ_SERIALISING, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 03/21] block/io: split out bdrv_find_conflicting_request, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 04/21] block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v7 05/21] block: bdrv_mark_request_serialising: split non-waiting function, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 06/21] block: introduce BDRV_REQ_NO_WAIT flag, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 14/21] scripts/simplebench: support iops, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 08/21] block: introduce preallocate filter, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 09/21] qemu-io: add preallocate mode parameter for truncate command, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 16/21] simplebench: rename ascii() to results_to_text(), Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 07/21] block: bdrv_check_perm(): process children anyway, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 15/21] scripts/simplebench: use standard deviation for +- error, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 10/21] iotests: qemu_io_silent: support --image-opts, Vladimir Sementsov-Ogievskiy, 2020/10/21
- [PATCH v7 11/21] iotests.py: execute_setup_common(): add required_fmts argument, Vladimir Sementsov-Ogievskiy, 2020/10/21