aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/copy-on-read.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/block/copy-on-read.c b/block/copy-on-read.c
index 22f24fd0db..6631f30205 100644
--- a/block/copy-on-read.c
+++ b/block/copy-on-read.c
@@ -56,16 +56,14 @@ static void cor_child_perm(BlockDriverState *bs, BdrvChild *c,
uint64_t perm, uint64_t shared,
uint64_t *nperm, uint64_t *nshared)
{
- if (c == NULL) {
- *nperm = (perm & PERM_PASSTHROUGH) | BLK_PERM_WRITE_UNCHANGED;
- *nshared = (shared & PERM_PASSTHROUGH) | PERM_UNCHANGED;
- return;
- }
+ *nperm = perm & PERM_PASSTHROUGH;
+ *nshared = (shared & PERM_PASSTHROUGH) | PERM_UNCHANGED;
- *nperm = (perm & PERM_PASSTHROUGH) |
- (c->perm & PERM_UNCHANGED);
- *nshared = (shared & PERM_PASSTHROUGH) |
- (c->shared_perm & PERM_UNCHANGED);
+ /* We must not request write permissions for an inactive node, the child
+ * cannot provide it. */
+ if (!(bs->open_flags & BDRV_O_INACTIVE)) {
+ *nperm |= BLK_PERM_WRITE_UNCHANGED;
+ }
}