[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 6/7] qcow2: introduce qcow2_write_caches and qcow2_f
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 6/7] qcow2: introduce qcow2_write_caches and qcow2_flush_caches |
Date: |
Wed, 17 Jan 2018 12:25:11 +0100 |
Avoid recursively taking s->lock during bdrv_check.
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/qcow2-refcount.c | 28 ++++++++++++++++++++++++++++
block/qcow2.c | 20 ++++----------------
block/qcow2.h | 2 ++
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 3de1ab5..e0d9dc1 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1172,7 +1172,35 @@ void qcow2_free_any_clusters(BlockDriverState *bs,
uint64_t l2_entry,
}
}
+int coroutine_fn qcow2_write_caches(BlockDriverState *bs)
+{
+ BDRVQcow2State *s = bs->opaque;
+ int ret;
+ ret = qcow2_cache_write(bs, s->l2_table_cache);
+ if (ret < 0) {
+ return ret;
+ }
+
+ if (qcow2_need_accurate_refcounts(s)) {
+ ret = qcow2_cache_write(bs, s->refcount_block_cache);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
+int coroutine_fn qcow2_flush_caches(BlockDriverState *bs)
+{
+ int ret = qcow2_write_caches(bs);
+ if (ret < 0) {
+ return ret;
+ }
+
+ return bdrv_flush(bs->file->bs);
+}
/*********************************************************/
/* snapshots and image creation */
diff --git a/block/qcow2.c b/block/qcow2.c
index e886a44..4a10b55 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -492,7 +492,7 @@ static int qcow2_mark_clean(BlockDriverState *bs)
s->incompatible_features &= ~QCOW2_INCOMPAT_DIRTY;
- ret = bdrv_flush(bs);
+ ret = qcow2_flush_caches(bs);
if (ret < 0) {
return ret;
}
@@ -522,7 +522,7 @@ int qcow2_mark_consistent(BlockDriverState *bs)
BDRVQcow2State *s = bs->opaque;
if (s->incompatible_features & QCOW2_INCOMPAT_CORRUPT) {
- int ret = bdrv_flush(bs);
+ int ret = qcow2_flush_caches(bs);
if (ret < 0) {
return ret;
}
@@ -3653,22 +3653,10 @@ static coroutine_fn int
qcow2_co_flush_to_os(BlockDriverState *bs)
int ret;
qemu_co_mutex_lock(&s->lock);
- ret = qcow2_cache_write(bs, s->l2_table_cache);
- if (ret < 0) {
- qemu_co_mutex_unlock(&s->lock);
- return ret;
- }
-
- if (qcow2_need_accurate_refcounts(s)) {
- ret = qcow2_cache_write(bs, s->refcount_block_cache);
- if (ret < 0) {
- qemu_co_mutex_unlock(&s->lock);
- return ret;
- }
- }
+ ret = qcow2_write_caches(bs);
qemu_co_mutex_unlock(&s->lock);
- return 0;
+ return ret;
}
static BlockMeasureInfo *qcow2_measure(QemuOpts *opts, BlockDriverState *in_bs,
diff --git a/block/qcow2.h b/block/qcow2.h
index 46c8cf4..25b50f8 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -570,6 +570,8 @@ void qcow2_free_any_clusters(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_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
BdrvCheckMode fix);
--
1.8.3.1
- [Qemu-block] [PATCH v2 0/7] Call check and invalidate_cache from coroutine context, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 2/7] qcow2: make qcow2_co_create2() a coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 3/7] qcow2: make qcow2_do_open a coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 4/7] qed: make bdrv_qed_do_open a coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 6/7] qcow2: introduce qcow2_write_caches and qcow2_flush_caches,
Paolo Bonzini <=
- [Qemu-block] [PATCH 1/7] block: rename .bdrv_create() to .bdrv_co_create(), Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 5/7] block: convert bdrv_invalidate_cache callback to coroutine_fn, Paolo Bonzini, 2018/01/17
- [Qemu-block] [PATCH 7/7] block: convert bdrv_check callback to coroutine_fn, Paolo Bonzini, 2018/01/17
- Re: [Qemu-block] [PATCH v2 0/7] Call check and invalidate_cache from coroutine context, Kevin Wolf, 2018/01/17