[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v18 10/15] commit: Use bdrv_drop_intermediate
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v18 10/15] commit: Use bdrv_drop_intermediate |
Date: |
Thu, 10 Apr 2014 10:47:11 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
---
block/mirror.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 22ec5be..c3d819e 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -490,14 +490,10 @@ immediate_exit:
if (bdrv_get_flags(s->target) != bdrv_get_flags(s->common.bs)) {
bdrv_reopen(s->target, bdrv_get_flags(s->common.bs), NULL);
}
- bdrv_swap(s->target, s->common.bs);
if (s->common.driver->job_type == BLOCK_JOB_TYPE_COMMIT) {
- /* drop the bs loop chain formed by the swap: break the loop then
- * trigger the unref from the top one */
- BlockDriverState *p = s->base->backing_hd;
- s->base->backing_hd = NULL;
- bdrv_op_unblock_all(p, s->base->backing_blocker);
- bdrv_unref(p);
+ ret = bdrv_drop_intermediate(s->common.bs, s->common.bs, s->base);
+ } else {
+ bdrv_swap(s->target, s->common.bs);
}
}
bdrv_unref(s->target);
--
1.9.1
- [Qemu-devel] [PATCH v18 00/15] Drop in_use from BlockDriverState and enable point-in-time snapshot exporting over NBD, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 01/15] block: Add BlockOpType enum, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 02/15] block: Introduce op_blockers to BlockDriverState, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 03/15] block: Replace in_use with operation blocker, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 04/15] block: Move op_blocker check from block_job_create to its caller, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 05/15] block: Add bdrv_set_backing_hd(), Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 06/15] block: Add backing_blocker in BlockDriverState, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 07/15] block: Parse "backing" option to reference existing BDS, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 08/15] block: Support dropping active in bdrv_drop_intermediate, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 09/15] stream: Use bdrv_drop_intermediate and drop close_unused_images, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 10/15] commit: Use bdrv_drop_intermediate,
Fam Zheng <=
- [Qemu-devel] [PATCH v18 11/15] qmp: Add command 'blockdev-backup', Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 12/15] block: Allow backup on referenced named BlockDriverState, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 13/15] block: Add blockdev-backup to transaction, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 14/15] qemu-iotests: Test blockdev-backup in 055, Fam Zheng, 2014/04/09
- [Qemu-devel] [PATCH v18 15/15] qemu-iotests: Image fleecing test case 089, Fam Zheng, 2014/04/09