[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 05/12] blockdev: Lock BDS during drive-backup tr
From: |
Fam Zheng |
Subject: |
[Qemu-block] [RFC PATCH 05/12] blockdev: Lock BDS during drive-backup transaction |
Date: |
Fri, 29 May 2015 18:53:18 +0800 |
To save the bs pointer for drive_backup_clean, pull the assignment to
state->bs up. It will not be a problem for drive_backup_abort because
state->job will still be NULL.
Signed-off-by: Fam Zheng <address@hidden>
---
blockdev.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/blockdev.c b/blockdev.c
index 1c3946a..517def4 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -1588,6 +1588,8 @@ static void drive_backup_prepare(BlkTransactionState
*common, Error **errp)
/* AioContext is released in .clean() */
state->aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(state->aio_context);
+ bdrv_lock(bs);
+ state->bs = bs;
qmp_drive_backup(backup->device, backup->target,
backup->has_format, backup->format,
@@ -1603,7 +1605,6 @@ static void drive_backup_prepare(BlkTransactionState
*common, Error **errp)
return;
}
- state->bs = bs;
state->job = state->bs->job;
}
@@ -1623,6 +1624,7 @@ static void drive_backup_clean(BlkTransactionState
*common)
DriveBackupState *state = DO_UPCAST(DriveBackupState, common, common);
if (state->aio_context) {
+ bdrv_unlock(state->bs);
aio_context_release(state->aio_context);
}
}
--
2.4.2
- [Qemu-block] [RFC PATCH 00/12] block: Protect block jobs with lock / unlock API, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 01/12] block: Use bdrv_drain to replace uncessary bdrv_drain_all, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 02/12] block: Introduce bdrv_lock and bdrv_unlock API, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 03/12] blockdev: Lock BDS during internal snapshot transaction, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 04/12] blockdev: Lock BDS during external snapshot transaction, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 05/12] blockdev: Lock BDS during drive-backup transaction,
Fam Zheng <=
- [Qemu-block] [RFC PATCH 06/12] blockdev: Lock BDS during blockdev-backup transaction, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 07/12] block-backend: Add blk_add_lock_unlock_notifier, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 08/12] virtio-blk: Move complete_request to 'ops' structure, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 09/12] virtio-blk: Don't handle output when backend is locked, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 10/12] virtio-scsi-dataplane: Add backend lock listener, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 11/12] nbd-server: Clear "can_read" when backend is locked, Fam Zheng, 2015/05/29
- [Qemu-block] [RFC PATCH 12/12] mirror: Protect source between bdrv_drain and bdrv_swap, Fam Zheng, 2015/05/29
- Re: [Qemu-block] [RFC PATCH 00/12] block: Protect block jobs with lock / unlock API, Paolo Bonzini, 2015/05/29