Commit e444fa83 authored Aug 02, 2019 by Kevin Wolf

block: Simplify bdrv_filter_default_perms()



The same change as commit 2b23f286 ('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>

parent 5b96e6a0

block.c

+2 −10

Original line number	Diff line number	Diff line
		@@ -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);
		}

		void bdrv_format_default_perms(BlockDriverState bs, BdrvChild c,