diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2019-08-02 15:59:41 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2019-08-16 10:25:16 +0200 |
| commit | e444fa83126d56f3feafe3c3397c149cac82ce96 (patch) | |
| tree | 2777d36983752cc847afbe2f7aca2736bbe75bc3 | |
| parent | 5b96e6a002d8791d24ef69ed67ee6d264239622d (diff) | |
| download | focaccia-qemu-e444fa83126d56f3feafe3c3397c149cac82ce96.tar.gz focaccia-qemu-e444fa83126d56f3feafe3c3397c149cac82ce96.zip | |
block: Simplify bdrv_filter_default_perms()
The same change as commit 2b23f28639 ('block/copy-on-read: Fix
permissions for inactive node') made for the copy-on-read driver can be
made for bdrv_filter_default_perms(): Retaining the old permissions from
the BdrvChild if it is given complicates things unnecessarily when in
the end this only means that the options set in the c == NULL case (i.e.
during child creation) are retained.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | block.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/block.c b/block.c index cbd8da5f3b..6db8ecd62b 100644 --- a/block.c +++ b/block.c @@ -2168,16 +2168,8 @@ void bdrv_filter_default_perms(BlockDriverState *bs, BdrvChild *c, uint64_t perm, uint64_t shared, uint64_t *nperm, uint64_t *nshared) { - if (c == NULL) { - *nperm = perm & DEFAULT_PERM_PASSTHROUGH; - *nshared = (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHANGED; - return; - } - - *nperm = (perm & DEFAULT_PERM_PASSTHROUGH) | - (c->perm & DEFAULT_PERM_UNCHANGED); - *nshared = (shared & DEFAULT_PERM_PASSTHROUGH) | - (c->shared_perm & DEFAULT_PERM_UNCHANGED); + *nperm = perm & DEFAULT_PERM_PASSTHROUGH; + *nshared = (shared & DEFAULT_PERM_PASSTHROUGH) | DEFAULT_PERM_UNCHANGED; } void bdrv_format_default_perms(BlockDriverState *bs, BdrvChild *c, |