block: Move op_blocker check from block_job_create to its caller
It makes no sense to check for "any" blocker on bs, we are here only because of the mechanical conversion from in_use to op_blockers. Remove it now, and let the callers check specific operation types. Backup and mirror already have it, add checker to stream and commit. Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Benoit Canet <benoit@irqsave.net> Reviewed-by: Jeff Cody <jcody@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
3718d8ab65
commit
628ff68303
|
@ -1889,6 +1889,10 @@ void qmp_block_stream(const char *device, bool has_base,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_STREAM, errp)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (base) {
|
if (base) {
|
||||||
base_bs = bdrv_find_backing_image(bs, base);
|
base_bs = bdrv_find_backing_image(bs, base);
|
||||||
if (base_bs == NULL) {
|
if (base_bs == NULL) {
|
||||||
|
@ -1933,6 +1937,10 @@ void qmp_block_commit(const char *device,
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (bdrv_op_is_blocked(bs, BLOCK_OP_TYPE_COMMIT, errp)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
/* default top_bs is the active layer */
|
/* default top_bs is the active layer */
|
||||||
top_bs = bs;
|
top_bs = bs;
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,7 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs,
|
||||||
{
|
{
|
||||||
BlockJob *job;
|
BlockJob *job;
|
||||||
|
|
||||||
if (bs->job || !bdrv_op_blocker_is_empty(bs)) {
|
if (bs->job) {
|
||||||
error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
|
error_set(errp, QERR_DEVICE_IN_USE, bdrv_get_device_name(bs));
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue