Commit d6fcdf06 authored by Jeff Cody's avatar Jeff Cody
Browse files

block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only 



The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
the BDS 'read_only' state, but there are a few places where it
is ignored.  In the bdrv_set_read_only() helper, make sure to
honor the flag.

Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
parent e2b8247a

block.c

+7 −0
Original line number Diff line number Diff line
@@ -201,6 +201,13 @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp) 
        return -EINVAL;

    }



    /* Do not clear read_only if it is prohibited */

    if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) {

        error_setg(errp, "Node '%s' is read only",

                   bdrv_get_device_or_node_name(bs));

        return -EPERM;

    }



    bs->read_only = read_only;

    return 0;

}