[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/21] block: add bdrv_drv_set_perm transaction action
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 09/21] block: add bdrv_drv_set_perm transaction action |
Date: |
Mon, 23 Nov 2020 23:12:21 +0300 |
Refactor calling driver callbacks to a separate transaction action to
be used later.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 71 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 55 insertions(+), 16 deletions(-)
diff --git a/block.c b/block.c
index 56263407e8..799c475dda 100644
--- a/block.c
+++ b/block.c
@@ -2094,6 +2094,54 @@ static void bdrv_child_set_perm_safe(BdrvChild *c,
uint64_t perm,
}
}
+static void bdrv_drv_set_perm_commit(void *opaque)
+{
+ BlockDriverState *bs = opaque;
+ uint64_t cumulative_perms, cumulative_shared_perms;
+
+ if (bs->drv->bdrv_set_perm) {
+ bdrv_get_cumulative_perm(bs, &cumulative_perms,
+ &cumulative_shared_perms);
+ bs->drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms);
+ }
+}
+
+static void bdrv_drv_set_perm_abort(void *opaque)
+{
+ BlockDriverState *bs = opaque;
+
+ if (bs->drv->bdrv_abort_perm_update) {
+ bs->drv->bdrv_abort_perm_update(bs);
+ }
+}
+
+BdrvActionDrv bdrv_drv_set_perm_drv = {
+ .abort = bdrv_drv_set_perm_abort,
+ .commit = bdrv_drv_set_perm_commit,
+};
+
+static int bdrv_drv_set_perm(BlockDriverState *bs, uint64_t perm,
+ uint64_t shared_perm, GSList **tran,
+ Error **errp)
+{
+ if (!bs->drv) {
+ return 0;
+ }
+
+ if (bs->drv->bdrv_check_perm) {
+ int ret = bs->drv->bdrv_check_perm(bs, perm, shared_perm, errp);
+ if (ret < 0) {
+ return ret;
+ }
+ }
+
+ if (tran) {
+ tran_prepend(tran, &bdrv_drv_set_perm_drv, bs);
+ }
+
+ return 0;
+}
+
/*
* Check whether permissions on this node can be changed in a way that
* @cumulative_perms and @cumulative_shared_perms are the new cumulative
@@ -2108,6 +2156,7 @@ static int bdrv_node_check_perm(BlockDriverState *bs,
BlockReopenQueue *q,
uint64_t cumulative_shared_perms,
GSList *ignore_children, Error **errp)
{
+ int ret;
BlockDriver *drv = bs->drv;
BdrvChild *c;
@@ -2153,12 +2202,10 @@ static int bdrv_node_check_perm(BlockDriverState *bs,
BlockReopenQueue *q,
return 0;
}
- if (drv->bdrv_check_perm) {
- int ret = drv->bdrv_check_perm(bs, cumulative_perms,
- cumulative_shared_perms, errp);
- if (ret < 0) {
- return ret;
- }
+ ret = bdrv_drv_set_perm(bs, cumulative_perms, cumulative_shared_perms,
NULL,
+ errp);
+ if (ret < 0) {
+ return ret;
}
/* Drivers that never have children can omit .bdrv_child_perm() */
@@ -2226,9 +2273,7 @@ static void bdrv_node_abort_perm_update(BlockDriverState
*bs)
return;
}
- if (drv->bdrv_abort_perm_update) {
- drv->bdrv_abort_perm_update(bs);
- }
+ bdrv_drv_set_perm_abort(bs);
QLIST_FOREACH(c, &bs->children, next) {
bdrv_child_set_perm_abort(c);
@@ -2246,7 +2291,6 @@ static void bdrv_abort_perm_update(BlockDriverState *bs)
static void bdrv_node_set_perm(BlockDriverState *bs)
{
- uint64_t cumulative_perms, cumulative_shared_perms;
BlockDriver *drv = bs->drv;
BdrvChild *c;
@@ -2254,12 +2298,7 @@ static void bdrv_node_set_perm(BlockDriverState *bs)
return;
}
- bdrv_get_cumulative_perm(bs, &cumulative_perms, &cumulative_shared_perms);
-
- /* Update this node */
- if (drv->bdrv_set_perm) {
- drv->bdrv_set_perm(bs, cumulative_perms, cumulative_shared_perms);
- }
+ bdrv_drv_set_perm_commit(bs);
/* Drivers that never have children can omit .bdrv_child_perm() */
if (!drv->bdrv_child_perm) {
--
2.21.3
- [PATCH 1/2] block: make bdrv_drop_intermediate() less wrong, (continued)
- [PATCH 1/2] block: make bdrv_drop_intermediate() less wrong, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 01/21] tests/test-bdrv-graph-mod: add test_parallel_exclusive_write, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 2/2] block: assert that permission commit sets same permissions, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 02/21] tests/test-bdrv-graph-mod: add test_parallel_perm_update, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 03/21] util: add transactions.c, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 04/21] block: bdrv_refresh_perms: check parents compliance, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 06/21] block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms(), Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 07/21] block: inline bdrv_child_*() permission functions calls, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 08/21] block: use topological sort for permission update, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 05/21] block: refactor bdrv_child* permission functions, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 09/21] block: add bdrv_drv_set_perm transaction action,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 10/21] block: add bdrv_list_* permission update functions, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 11/21] block: add bdrv_replace_child_safe() transaction action, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 12/21] block: return value from bdrv_replace_node(), Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 14/21] block: add bdrv_attach_child_noperm() transaction action, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 15/21] block: split out bdrv_replace_node_noperm(), Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 13/21] block: fix bdrv_replace_node_common, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 16/21] block: bdrv_append(): don't consume reference, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 21/21] block/backup-top: drop .active, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 19/21] block: add bdrv_remove_backing transaction action, Vladimir Sementsov-Ogievskiy, 2020/11/23
- [PATCH 17/21] block: bdrv_append(): return status, Vladimir Sementsov-Ogievskiy, 2020/11/23