mirror of https://github.com/proxmox/mirror_qemu
block: inline bdrv_child_*() permission functions calls
Each of them has only one caller. Open-coding simplifies further pemission-update system changes. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20210428151804.439460-13-vsementsov@virtuozzo.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>master
parent
83928dc496
commit
3ef45e0242
59
block.c
59
block.c
|
@ -1974,11 +1974,11 @@ static int bdrv_fill_options(QDict **options, const char *filename,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
|
static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
|
||||||
uint64_t perm, uint64_t shared,
|
uint64_t new_used_perm,
|
||||||
GSList *ignore_children, Error **errp);
|
uint64_t new_shared_perm,
|
||||||
static void bdrv_child_abort_perm_update(BdrvChild *c);
|
GSList *ignore_children,
|
||||||
static void bdrv_child_set_perm(BdrvChild *c);
|
Error **errp);
|
||||||
|
|
||||||
typedef struct BlockReopenQueueEntry {
|
typedef struct BlockReopenQueueEntry {
|
||||||
bool prepared;
|
bool prepared;
|
||||||
|
@ -2226,15 +2226,21 @@ static int bdrv_check_perm(BlockDriverState *bs, BlockReopenQueue *q,
|
||||||
/* Check all children */
|
/* Check all children */
|
||||||
QLIST_FOREACH(c, &bs->children, next) {
|
QLIST_FOREACH(c, &bs->children, next) {
|
||||||
uint64_t cur_perm, cur_shared;
|
uint64_t cur_perm, cur_shared;
|
||||||
|
GSList *cur_ignore_children;
|
||||||
|
|
||||||
bdrv_child_perm(bs, c->bs, c, c->role, q,
|
bdrv_child_perm(bs, c->bs, c, c->role, q,
|
||||||
cumulative_perms, cumulative_shared_perms,
|
cumulative_perms, cumulative_shared_perms,
|
||||||
&cur_perm, &cur_shared);
|
&cur_perm, &cur_shared);
|
||||||
ret = bdrv_child_check_perm(c, q, cur_perm, cur_shared, ignore_children,
|
|
||||||
errp);
|
cur_ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
|
||||||
|
ret = bdrv_check_update_perm(c->bs, q, cur_perm, cur_shared,
|
||||||
|
cur_ignore_children, errp);
|
||||||
|
g_slist_free(cur_ignore_children);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bdrv_child_set_perm_safe(c, cur_perm, cur_shared, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2261,7 +2267,8 @@ static void bdrv_abort_perm_update(BlockDriverState *bs)
|
||||||
}
|
}
|
||||||
|
|
||||||
QLIST_FOREACH(c, &bs->children, next) {
|
QLIST_FOREACH(c, &bs->children, next) {
|
||||||
bdrv_child_abort_perm_update(c);
|
bdrv_child_set_perm_abort(c);
|
||||||
|
bdrv_abort_perm_update(c->bs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2290,7 +2297,8 @@ static void bdrv_set_perm(BlockDriverState *bs)
|
||||||
|
|
||||||
/* Update all children */
|
/* Update all children */
|
||||||
QLIST_FOREACH(c, &bs->children, next) {
|
QLIST_FOREACH(c, &bs->children, next) {
|
||||||
bdrv_child_set_perm(c);
|
bdrv_child_set_perm_commit(c);
|
||||||
|
bdrv_set_perm(c->bs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2398,39 +2406,6 @@ static int bdrv_check_update_perm(BlockDriverState *bs, BlockReopenQueue *q,
|
||||||
ignore_children, errp);
|
ignore_children, errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Needs to be followed by a call to either bdrv_child_set_perm() or
|
|
||||||
* bdrv_child_abort_perm_update(). */
|
|
||||||
static int bdrv_child_check_perm(BdrvChild *c, BlockReopenQueue *q,
|
|
||||||
uint64_t perm, uint64_t shared,
|
|
||||||
GSList *ignore_children, Error **errp)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
|
|
||||||
ignore_children = g_slist_prepend(g_slist_copy(ignore_children), c);
|
|
||||||
ret = bdrv_check_update_perm(c->bs, q, perm, shared, ignore_children, errp);
|
|
||||||
g_slist_free(ignore_children);
|
|
||||||
|
|
||||||
if (ret < 0) {
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
bdrv_child_set_perm_safe(c, perm, shared, NULL);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void bdrv_child_set_perm(BdrvChild *c)
|
|
||||||
{
|
|
||||||
bdrv_child_set_perm_commit(c);
|
|
||||||
bdrv_set_perm(c->bs);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void bdrv_child_abort_perm_update(BdrvChild *c)
|
|
||||||
{
|
|
||||||
bdrv_child_set_perm_abort(c);
|
|
||||||
bdrv_abort_perm_update(c->bs);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp)
|
static int bdrv_refresh_perms(BlockDriverState *bs, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
|
Loading…
Reference in New Issue