ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: rewrite bdrv_child_try_set_perm() using bdrv_refresh_perms() 

We are going to drop recursive bdrv_child_* functions, so stop use them
in bdrv_child_try_set_perm() as a first step.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210428151804.439460-12-vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-04-28 18:17:39 +03:00 committed by Kevin Wolf
parent b0defa8356
commit 83928dc496
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
block.c
View File

@ -2454,11 +2454,16 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
Error **errp) Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
Transaction *tran = tran_new();
int ret; int ret;
ret = bdrv_child_check_perm(c, NULL, perm, shared, NULL, &local_err); bdrv_child_set_perm_safe(c, perm, shared, tran);
ret = bdrv_refresh_perms(c->bs, &local_err);
tran_finalize(tran, ret);
if (ret < 0) { if (ret < 0) {
bdrv_child_abort_perm_update(c);
if ((perm & ~c->perm) || (c->shared_perm & ~shared)) { if ((perm & ~c->perm) || (c->shared_perm & ~shared)) {
/* tighten permissions */ /* tighten permissions */
error_propagate(errp, local_err); error_propagate(errp, local_err);
@ -2472,12 +2477,9 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,
error_free(local_err); error_free(local_err);
ret = 0; ret = 0;
} }
return ret;
} }
bdrv_child_set_perm(c); return ret;
return 0;
} }
int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp) int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp)