[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations |
Date: |
Mon, 9 May 2022 12:29:55 +0200 |
This is incorrect because qcow2_mark_clean() calls qcow2_flush_caches().
qcow2_mark_clean() is called from non-coroutine context in
qcow2_inactivate() and qcow2_close().
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block/qcow2-refcount.c | 4 ++--
block/qcow2.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index ed0ecfaa89..404d56e258 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1206,7 +1206,7 @@ void qcow2_free_any_cluster(BlockDriverState *bs,
uint64_t l2_entry,
}
}
-int coroutine_fn qcow2_write_caches(BlockDriverState *bs)
+int qcow2_write_caches(BlockDriverState *bs)
{
BDRVQcow2State *s = bs->opaque;
int ret;
@@ -1226,7 +1226,7 @@ int coroutine_fn qcow2_write_caches(BlockDriverState *bs)
return 0;
}
-int coroutine_fn qcow2_flush_caches(BlockDriverState *bs)
+int qcow2_flush_caches(BlockDriverState *bs)
{
int ret = qcow2_write_caches(bs);
if (ret < 0) {
diff --git a/block/qcow2.h b/block/qcow2.h
index ba436a8d0d..c8d9e8ea79 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -874,8 +874,8 @@ void qcow2_free_any_cluster(BlockDriverState *bs, uint64_t
l2_entry,
int qcow2_update_snapshot_refcount(BlockDriverState *bs,
int64_t l1_table_offset, int l1_size, int addend);
-int coroutine_fn qcow2_flush_caches(BlockDriverState *bs);
-int coroutine_fn qcow2_write_caches(BlockDriverState *bs);
+int qcow2_flush_caches(BlockDriverState *bs);
+int qcow2_write_caches(BlockDriverState *bs);
int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
BdrvCheckMode fix);
--
2.35.1
- [PATCH v2 00/26] block: fix coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 03/26] nbd: remove incorrect coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 02/26] qcow2: remove incorrect coroutine_fn annotations,
Paolo Bonzini <=
- [PATCH v2 01/26] block: remove incorrect coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 05/26] blkdebug: add missing coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 06/26] blkverify: add missing coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 04/26] coroutine: remove incorrect coroutine_fn annotations, Paolo Bonzini, 2022/05/09
- [PATCH v2 07/26] block: add missing coroutine_fn annotations, Paolo Bonzini, 2022/05/09