[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 6/6] file-posix: Remove .bdrv_inactivate/invalidate_
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PATCH 6/6] file-posix: Remove .bdrv_inactivate/invalidate_cache |
Date: |
Thu, 4 May 2017 18:52:41 +0200 |
Now that the block layer takes care to request a lot less permissions
for inactive nodes, the special-casing in file-posix isn't necessary any
more.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/file-posix.c | 33 ---------------------------------
1 file changed, 33 deletions(-)
diff --git a/block/file-posix.c b/block/file-posix.c
index f1f924b..90a5f53 100644
--- a/block/file-posix.c
+++ b/block/file-posix.c
@@ -2190,35 +2190,6 @@ static void raw_abort_perm_update(BlockDriverState *bs)
raw_handle_perm_lock(bs, RAW_PL_ABORT, 0, 0, NULL);
}
-static int raw_inactivate(BlockDriverState *bs)
-{
- int ret;
- uint64_t perm = 0;
- uint64_t shared = BLK_PERM_ALL;
-
- ret = raw_handle_perm_lock(bs, RAW_PL_PREPARE, perm, shared, NULL);
- if (ret) {
- return ret;
- }
- raw_handle_perm_lock(bs, RAW_PL_COMMIT, perm, shared, NULL);
- return 0;
-}
-
-
-static void raw_invalidate_cache(BlockDriverState *bs, Error **errp)
-{
- BDRVRawState *s = bs->opaque;
- int ret;
-
- assert(!(bdrv_get_flags(bs) & BDRV_O_INACTIVE));
- ret = raw_handle_perm_lock(bs, RAW_PL_PREPARE, s->perm, s->shared_perm,
- errp);
- if (ret) {
- return;
- }
- raw_handle_perm_lock(bs, RAW_PL_COMMIT, s->perm, s->shared_perm, NULL);
-}
-
BlockDriver bdrv_file = {
.format_name = "file",
.protocol_name = "file",
@@ -2249,8 +2220,6 @@ BlockDriver bdrv_file = {
.bdrv_get_info = raw_get_info,
.bdrv_get_allocated_file_size
= raw_get_allocated_file_size,
- .bdrv_inactivate = raw_inactivate,
- .bdrv_invalidate_cache = raw_invalidate_cache,
.bdrv_check_perm = raw_check_perm,
.bdrv_set_perm = raw_set_perm,
.bdrv_abort_perm_update = raw_abort_perm_update,
@@ -2712,8 +2681,6 @@ static BlockDriver bdrv_host_device = {
.bdrv_get_info = raw_get_info,
.bdrv_get_allocated_file_size
= raw_get_allocated_file_size,
- .bdrv_inactivate = raw_inactivate,
- .bdrv_invalidate_cache = raw_invalidate_cache,
.bdrv_check_perm = raw_check_perm,
.bdrv_set_perm = raw_set_perm,
.bdrv_abort_perm_update = raw_abort_perm_update,
--
1.8.3.1
- [Qemu-block] [PATCH 1/6] migration: Unify block node activation error handling, (continued)
- [Qemu-block] [PATCH 1/6] migration: Unify block node activation error handling, Kevin Wolf, 2017/05/04
- [Qemu-block] [PATCH 2/6] block: New BdrvChildRole.activate() for blk_resume_after_migration(), Kevin Wolf, 2017/05/04
- [Qemu-block] [PATCH 3/6] block: Drop permissions when migration completes, Kevin Wolf, 2017/05/04
- [Qemu-block] [PATCH 4/6] block: Inactivate parents before children, Kevin Wolf, 2017/05/04
- [Qemu-block] [PATCH 5/6] block: Fix write/resize permissions for inactive images, Kevin Wolf, 2017/05/04
- [Qemu-block] [PATCH 6/6] file-posix: Remove .bdrv_inactivate/invalidate_cache,
Kevin Wolf <=
- Re: [Qemu-block] [PATCH 0/6] block: Fix op blockers for inactive images, Kevin Wolf, 2017/05/09