diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2021-04-28 18:17:39 +0300 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2021-04-30 12:27:48 +0200 |
| commit | 83928dc4968284c8c0c56c8186c5a789b794ef5a (patch) | |
| tree | ceafe1f2833c1cab93f4e0f2c430fead23fbddc1 /block.c | |
| parent | b0defa83562dc904000679ea9eda46985c574d80 (diff) | |
| download | focaccia-qemu-83928dc4968284c8c0c56c8186c5a789b794ef5a.tar.gz focaccia-qemu-83928dc4968284c8c0c56c8186c5a789b794ef5a.zip | |
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>
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/block.c b/block.c index 0ee0c2f29a..4511766825 100644 --- a/block.c +++ b/block.c @@ -2454,11 +2454,16 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, Error **errp) { Error *local_err = NULL; + Transaction *tran = tran_new(); 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) { - bdrv_child_abort_perm_update(c); if ((perm & ~c->perm) || (c->shared_perm & ~shared)) { /* tighten permissions */ 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); ret = 0; } - return ret; } - bdrv_child_set_perm(c); - - return 0; + return ret; } int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp) |