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

block: Always call bdrv_child_check_perm first 



bdrv_child_set_perm alone is not very usable because the caller must
call bdrv_child_check_perm first. This is already encapsulated
conveniently in bdrv_child_try_set_perm, so remove the other prototypes
from the header and fix the one wrong caller, block/mirror.c.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent fed414df

block.c

+9 −4
Original line number Diff line number Diff line
@@ -1393,6 +1393,11 @@ static int bdrv_fill_options(QDict **options, const char *filename, 
    return 0;

}



static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

                                 GSList *ignore_children, Error **errp);

static void bdrv_child_abort_perm_update(BdrvChild *c);

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



/*

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

 * @cumulative_perms and @cumulative_shared_perms are the new cumulative
@@ -1615,7 +1620,7 @@ static int bdrv_check_update_perm(BlockDriverState *bs, uint64_t new_used_perm, 


/* Needs to be followed by a call to either bdrv_child_set_perm() or

 * bdrv_child_abort_perm_update(). */

int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

static int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

                                 GSList *ignore_children, Error **errp)

{

    int ret;
@@ -1627,7 +1632,7 @@ int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared, 
    return ret;

}



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

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

{

    uint64_t cumulative_perms, cumulative_shared_perms;
@@ -1639,7 +1644,7 @@ void bdrv_child_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared) 
    bdrv_set_perm(c->bs, cumulative_perms, cumulative_shared_perms);

}



void bdrv_child_abort_perm_update(BdrvChild *c)

static void bdrv_child_abort_perm_update(BdrvChild *c)

{

    bdrv_abort_perm_update(c->bs);

}

block/mirror.c

+4 −2
Original line number Diff line number Diff line
@@ -574,7 +574,8 @@ static void mirror_exit(BlockJob *job, void *opaque) 
     * valid. Also give up permissions on mirror_top_bs->backing, which might

     * block the removal. */

    block_job_remove_all_bdrv(job);

    bdrv_child_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL);

    bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,

                            &error_abort);

    bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abort);



    /* We just changed the BDS the job BB refers to (with either or both of the
@@ -1245,7 +1246,8 @@ fail: 
        block_job_unref(&s->common);

    }



    bdrv_child_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL);

    bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,

                            &error_abort);

    bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abort);

}

include/block/block_int.h

+0 −4
Original line number Diff line number Diff line
@@ -889,10 +889,6 @@ BdrvChild *bdrv_root_attach_child(BlockDriverState *child_bs, 
                                  void *opaque, Error **errp);

void bdrv_root_unref_child(BdrvChild *child);



int bdrv_child_check_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

                          GSList *ignore_children, Error **errp);

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

void bdrv_child_abort_perm_update(BdrvChild *c);

int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared,

                            Error **errp);