Skip to contentSkip to conversation

block: Simplify bdrv_filter_default_perms()

PATCH In review Kevin Wolf 3 participants 3 messages Aug 2, 2019 – Aug 6, 2019

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 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 unnecessary when in the end this only means that the options set in the c == NULL case (i.e. during child creation) are retained.

---
 block.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
block.c +2 -10
index cbd8da5f3b..6db8ecd62b 100644
@@ -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,
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Kevin Wolf

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 unnecessary when in the

unnecessarily

Quoted 7 lines

end this only means that the options set in the c == NULL case (i.e. during child creation) are retained.

---
 block.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org
Reviewed-by on v1 1/1
#2 lore raw
In reply to Kevin Wolf
Quoted 6 lines · Kevin Wolf

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 unnecessary when in the end this only means that the options set in the c == NULL case (i.e. during child creation) are retained.

My best guess is that we had this code because this way any party could set or remove the GRAPH_MOD permission and it would be kept through .bdrv_child_perm() invocations. (But I think that’s kaputt.)

Quoted 4 lines
---
 block.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)