mirror of https://github.com/proxmox/mirror_qemu
block: Drop superfluous invalidating bs->file from drivers
Now they are invalidated by the block layer, so it's not necessary to do this in block drivers' implementations of .bdrv_invalidate_cache. Signed-off-by: Fam Zheng <famz@redhat.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>master
parent
0d1c5c9160
commit
c9e9e9c66c
|
@ -1757,13 +1757,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp)
|
||||||
|
|
||||||
qcow2_close(bs);
|
qcow2_close(bs);
|
||||||
|
|
||||||
bdrv_invalidate_cache(bs->file->bs, &local_err);
|
|
||||||
if (local_err) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
bs->drv = NULL;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(s, 0, sizeof(BDRVQcow2State));
|
memset(s, 0, sizeof(BDRVQcow2State));
|
||||||
options = qdict_clone_shallow(bs->options);
|
options = qdict_clone_shallow(bs->options);
|
||||||
|
|
||||||
|
|
|
@ -1594,12 +1594,6 @@ static void bdrv_qed_invalidate_cache(BlockDriverState *bs, Error **errp)
|
||||||
|
|
||||||
bdrv_qed_close(bs);
|
bdrv_qed_close(bs);
|
||||||
|
|
||||||
bdrv_invalidate_cache(bs->file->bs, &local_err);
|
|
||||||
if (local_err) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
memset(s, 0, sizeof(BDRVQEDState));
|
memset(s, 0, sizeof(BDRVQEDState));
|
||||||
ret = bdrv_qed_open(bs, NULL, bs->open_flags, &local_err);
|
ret = bdrv_qed_open(bs, NULL, bs->open_flags, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
|
|
|
@ -747,21 +747,6 @@ static int64_t quorum_getlength(BlockDriverState *bs)
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void quorum_invalidate_cache(BlockDriverState *bs, Error **errp)
|
|
||||||
{
|
|
||||||
BDRVQuorumState *s = bs->opaque;
|
|
||||||
Error *local_err = NULL;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
for (i = 0; i < s->num_children; i++) {
|
|
||||||
bdrv_invalidate_cache(s->children[i]->bs, &local_err);
|
|
||||||
if (local_err) {
|
|
||||||
error_propagate(errp, local_err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static coroutine_fn int quorum_co_flush(BlockDriverState *bs)
|
static coroutine_fn int quorum_co_flush(BlockDriverState *bs)
|
||||||
{
|
{
|
||||||
BDRVQuorumState *s = bs->opaque;
|
BDRVQuorumState *s = bs->opaque;
|
||||||
|
@ -1070,7 +1055,6 @@ static BlockDriver bdrv_quorum = {
|
||||||
|
|
||||||
.bdrv_aio_readv = quorum_aio_readv,
|
.bdrv_aio_readv = quorum_aio_readv,
|
||||||
.bdrv_aio_writev = quorum_aio_writev,
|
.bdrv_aio_writev = quorum_aio_writev,
|
||||||
.bdrv_invalidate_cache = quorum_invalidate_cache,
|
|
||||||
|
|
||||||
.bdrv_detach_aio_context = quorum_detach_aio_context,
|
.bdrv_detach_aio_context = quorum_detach_aio_context,
|
||||||
.bdrv_attach_aio_context = quorum_attach_aio_context,
|
.bdrv_attach_aio_context = quorum_attach_aio_context,
|
||||||
|
|
Loading…
Reference in New Issue