diff mbox series

replication: Fix replication open fail

Message ID 1508914283-2531-1-git-send-email-wang.guang55@zte.com.cn
State New
Headers show
Series replication: Fix replication open fail | expand

Commit Message

Wang Guang Oct. 25, 2017, 6:51 a.m. UTC 
replication_child_perm request write
permissions for all child which will lead bdrv_check_perm fail.
replication_child_perm() should request write
permissions only if it is writable itself.

Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>
---
 block/replication.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

Comments

Xie Changlong Oct. 26, 2017, 2:52 p.m. UTC | #1 
在 10/25/2017 2:51 PM, Wang Guang 写道:
> replication_child_perm request write
> permissions for all child which will lead bdrv_check_perm fail.
> replication_child_perm() should request write
> permissions only if it is writable itself.
>
> Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
> Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>

Thanks, this patch fixs the problem in
http://lists.nongnu.org/archive/html/qemu-devel/2017-08/msg03358.html.

Reviewed-by: Xie Changlong <xiechanglong@cmss.chinamobile.com>

> ---
>   block/replication.c | 11 +++++++----
>   1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/block/replication.c b/block/replication.c
> index 3a4e682..1c95d67 100644
> --- a/block/replication.c
> +++ b/block/replication.c
> @@ -161,10 +161,13 @@ static void replication_child_perm(BlockDriverState *bs, BdrvChild *c,
>                                      uint64_t perm, uint64_t shared,
>                                      uint64_t *nperm, uint64_t *nshared)
>   {
> -    *nperm = *nshared = BLK_PERM_CONSISTENT_READ \
> -                        | BLK_PERM_WRITE \
> -                        | BLK_PERM_WRITE_UNCHANGED;
> -
> +    *nperm = BLK_PERM_CONSISTENT_READ;
> +    if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) == BDRV_O_RDWR) {
> +        *nperm |= BLK_PERM_WRITE;
> +    }
> +    *nshared = BLK_PERM_CONSISTENT_READ \
> +               | BLK_PERM_WRITE \
> +               | BLK_PERM_WRITE_UNCHANGED;
>       return;
>   }
>
>
Kevin Wolf Oct. 27, 2017, 7:15 a.m. UTC | #2 
Am 25.10.2017 um 08:51 hat Wang Guang geschrieben:
> replication_child_perm request write
> permissions for all child which will lead bdrv_check_perm fail.
> replication_child_perm() should request write
> permissions only if it is writable itself.
> 
> Signed-off-by: Wang Guang <wang.guang55@zte.com.cn>
> Signed-off-by: Wang Yong <wang.yong155@zte.com.cn>

Thanks, applied to the block branch.

Kevin
diff mbox series

Patch

diff --git a/block/replication.c b/block/replication.c
index 3a4e682..1c95d67 100644
--- a/block/replication.c
+++ b/block/replication.c
@@ -161,10 +161,13 @@  static void replication_child_perm(BlockDriverState *bs, BdrvChild *c,
                                    uint64_t perm, uint64_t shared,
                                    uint64_t *nperm, uint64_t *nshared)
 {
-    *nperm = *nshared = BLK_PERM_CONSISTENT_READ \
-                        | BLK_PERM_WRITE \
-                        | BLK_PERM_WRITE_UNCHANGED;
-
+    *nperm = BLK_PERM_CONSISTENT_READ;
+    if ((bs->open_flags & (BDRV_O_INACTIVE | BDRV_O_RDWR)) == BDRV_O_RDWR) {
+        *nperm |= BLK_PERM_WRITE;
+    }
+    *nshared = BLK_PERM_CONSISTENT_READ \
+               | BLK_PERM_WRITE \
+               | BLK_PERM_WRITE_UNCHANGED;
     return;
 }