OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/io: bdrv_wait_serialising_requests_locked: drop extra bs arg 

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>
Message-Id: <20201021145859.11201-5-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2020-10-21 17:58:42 +03:00 committed by Max Reitz
parent 3183937ff9
commit ec1c886831
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
block/io.c
View File

@ -788,16 +788,16 @@ bdrv_find_conflicting_request(BdrvTrackedRequest *self)
return NULL; return NULL;
} }
/* Called with self->bs->reqs_lock held */
static bool coroutine_fn static bool coroutine_fn
bdrv_wait_serialising_requests_locked(BlockDriverState *bs, bdrv_wait_serialising_requests_locked(BdrvTrackedRequest *self)
BdrvTrackedRequest *self)
{ {
BdrvTrackedRequest *req; BdrvTrackedRequest *req;
bool waited = false; bool waited = false;
while ((req = bdrv_find_conflicting_request(self))) { while ((req = bdrv_find_conflicting_request(self))) {
self->waiting_for = req; 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; self->waiting_for = NULL;
waited = true; waited = true;
} }
@ -821,7 +821,7 @@ bool bdrv_mark_request_serialising(BdrvTrackedRequest *req, uint64_t align)
req->overlap_offset = MIN(req->overlap_offset, overlap_offset); req->overlap_offset = MIN(req->overlap_offset, overlap_offset);
req->overlap_bytes = MAX(req->overlap_bytes, overlap_bytes); 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); qemu_co_mutex_unlock(&bs->reqs_lock);
return waited; return waited;
} }
@ -903,7 +903,7 @@ static bool coroutine_fn bdrv_wait_serialising_requests(BdrvTrackedRequest *self
} }
qemu_co_mutex_lock(&bs->reqs_lock); 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); qemu_co_mutex_unlock(&bs->reqs_lock);
return waited; return waited;