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
---
block/qcow2.c | 7 ---
block/qed.c| 6 --
block/quorum.c | 16
3 files changed, 29 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index 470734b..d4431e0 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1757,13 +1757,6 @@ static void qcow2_invalidate_cache(BlockDriverState *bs,
Error **errp)
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));
options = qdict_clone_shallow(bs->options);
diff --git a/block/qed.c b/block/qed.c
index 0af5274..9081941 100644
--- a/block/qed.c
+++ b/block/qed.c
@@ -1594,12 +1594,6 @@ static void bdrv_qed_invalidate_cache(BlockDriverState
*bs, Error **errp)
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));
ret = bdrv_qed_open(bs, NULL, bs->open_flags, &local_err);
if (local_err) {
diff --git a/block/quorum.c b/block/quorum.c
index da15465..8f7c099 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -747,21 +747,6 @@ static int64_t quorum_getlength(BlockDriverState *bs)
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)
{
BDRVQuorumState *s = bs->opaque;
@@ -1070,7 +1055,6 @@ static BlockDriver bdrv_quorum = {
.bdrv_aio_readv = quorum_aio_readv,
.bdrv_aio_writev= quorum_aio_writev,
-.bdrv_invalidate_cache = quorum_invalidate_cache,
.bdrv_detach_aio_context= quorum_detach_aio_context,
.bdrv_attach_aio_context= quorum_attach_aio_context,
--
2.8.2
