| Message ID | 20200204170848.614480-30-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: Introduce real BdrvChildRole | expand |
On 2/4/20 11:08 AM, Max Reitz wrote: > Signed-off-by: Max Reitz <mreitz@redhat.com> > --- > block.c | 12 ++++++------ > include/block/block_int.h | 10 ---------- > 2 files changed, 6 insertions(+), 16 deletions(-) > > diff --git a/block.c b/block.c > index 747a2973f5..091e9cc16a 100644 > --- a/block.c > +++ b/block.c > @@ -2194,12 +2194,12 @@ int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp) > return bdrv_child_try_set_perm(c, perms, shared, errp); > } > > -void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, > - const BdrvChildClass *child_class, > - BdrvChildRole role, > - BlockReopenQueue *reopen_queue, > - uint64_t perm, uint64_t shared, > - uint64_t *nperm, uint64_t *nshared) > +static void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, > + const BdrvChildClass *child_class, > + BdrvChildRole role, > + BlockReopenQueue *reopen_queue, > + uint64_t perm, uint64_t shared, > + uint64_t *nperm, uint64_t *nshared) > { Hmm - no comment here... > *nperm = perm & DEFAULT_PERM_PASSTHROUGH; > *nshared = (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHANGED; > diff --git a/include/block/block_int.h b/include/block/block_int.h > index 7b51866678..5e3f512ae8 100644 > --- a/include/block/block_int.h > +++ b/include/block/block_int.h > @@ -1254,16 +1254,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, > */ > int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp); > > -/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by > - * block filters: Forward CONSISTENT_READ, WRITE, WRITE_UNCHANGED and RESIZE to > - * all children */ > -void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, ...and you lost the comment here. It's still a useful comment, so move it to the .c (and wing it to keep syntax check happy). With that, Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/block.c b/block.c index 747a2973f5..091e9cc16a 100644 --- a/block.c +++ b/block.c @@ -2194,12 +2194,12 @@ int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp) return bdrv_child_try_set_perm(c, perms, shared, errp); } -void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, - const BdrvChildClass *child_class, - BdrvChildRole role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nshared) +static void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, + const BdrvChildClass *child_class, + BdrvChildRole role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) { *nperm = perm & DEFAULT_PERM_PASSTHROUGH; *nshared = (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHANGED; diff --git a/include/block/block_int.h b/include/block/block_int.h index 7b51866678..5e3f512ae8 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -1254,16 +1254,6 @@ int bdrv_child_try_set_perm(BdrvChild *c, uint64_t perm, uint64_t shared, */ int bdrv_child_refresh_perms(BlockDriverState *bs, BdrvChild *c, Error **errp); -/* Default implementation for BlockDriver.bdrv_child_perm() that can be used by - * block filters: Forward CONSISTENT_READ, WRITE, WRITE_UNCHANGED and RESIZE to - * all children */ -void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, - const BdrvChildClass *child_class, - BdrvChildRole child_role, - BlockReopenQueue *reopen_queue, - uint64_t perm, uint64_t shared, - uint64_t *nperm, uint64_t *nshared); - /* Default implementation for BlockDriver.bdrv_child_perm() that can be used by * (non-raw) image formats: Like above for bs->backing, but for bs->file it * requires WRITE | RESIZE for read-write images, always requires
Signed-off-by: Max Reitz <mreitz@redhat.com> --- block.c | 12 ++++++------ include/block/block_int.h | 10 ---------- 2 files changed, 6 insertions(+), 16 deletions(-)