Commit ffd1a5a2 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

block: Respect "force-share" in perm propagating 



Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 5a9347c6

block.c

+24 −8
Original line number Diff line number Diff line
@@ -1465,6 +1465,22 @@ static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared, 
static void bdrv_child_abort_perm_update(BdrvChild *c);

static void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared);



static void bdrv_child_perm(BlockDriverState *bs, BlockDriverState *child_bs,

                            BdrvChild *c,

                            const BdrvChildRole *role,

                            uint64_t parent_perm, uint64_t parent_shared,

                            uint64_t *nperm, uint64_t *nshared)

{

    if (bs->drv && bs->drv->bdrv_child_perm) {

        bs->drv->bdrv_child_perm(bs, c, role,

                                 parent_perm, parent_shared,

                                 nperm, nshared);

    }

    if (child_bs && child_bs->force_share) {

        *nshared = BLK_PERM_ALL;

    }

}



/*

 * Check whether permissions on this node can be changed in a way that

 * @cumulative_perms and @cumulative_shared_perms are the new cumulative
@@ -1509,7 +1525,7 @@ static int bdrv_check_perm(BlockDriverState *bs, uint64_t cumulative_perms, 
    /* Check all children */

    QLIST_FOREACH(c, &bs->children, next) {

        uint64_t cur_perm, cur_shared;

        drv->bdrv_child_perm(bs, c, c->role,

        bdrv_child_perm(bs, c->bs, c, c->role,

                        cumulative_perms, cumulative_shared_perms,

                        &cur_perm, &cur_shared);

        ret = bdrv_child_check_perm(c, cur_perm, cur_shared, ignore_children,
@@ -1571,7 +1587,7 @@ static void bdrv_set_perm(BlockDriverState *bs, uint64_t cumulative_perms, 
    /* Update all children */

    QLIST_FOREACH(c, &bs->children, next) {

        uint64_t cur_perm, cur_shared;

        drv->bdrv_child_perm(bs, c, c->role,

        bdrv_child_perm(bs, c->bs, c, c->role,

                        cumulative_perms, cumulative_shared_perms,

                        &cur_perm, &cur_shared);

        bdrv_child_set_perm(c, cur_perm, cur_shared);
@@ -1908,7 +1924,7 @@ BdrvChild *bdrv_attach_child(BlockDriverState *parent_bs, 


    assert(parent_bs->drv);

    assert(bdrv_get_aio_context(parent_bs) == bdrv_get_aio_context(child_bs));

    parent_bs->drv->bdrv_child_perm(parent_bs, NULL, child_role,

    bdrv_child_perm(parent_bs, child_bs, NULL, child_role,

                    perm, shared_perm, &perm, &shared_perm);



    child = bdrv_root_attach_child(child_bs, child_name, child_role,