| Message ID | 20181012115532.12645-9-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | block: Add auto-read-only option | expand |
On 10/12/18 6:55 AM, Kevin Wolf wrote: > If read-only=off, but auto-read-only=on is given, open the volume > read-write if we have the permissions, but instead of erroring out for > read-only volumes, just degrade to read-only. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > block/iscsi.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/block/iscsi.c b/block/iscsi.c index bb69faf34a..130ae26f5f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1878,9 +1878,11 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, /* Check the write protect flag of the LUN if we want to write */ if (iscsilun->type == TYPE_DISK && (flags & BDRV_O_RDWR) && iscsilun->write_protected) { - error_setg(errp, "Cannot open a write protected LUN as read-write"); - ret = -EACCES; - goto out; + ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp); + if (ret < 0) { + goto out; + } + flags &= ~BDRV_O_RDWR; } iscsi_readcapacity_sync(iscsilun, &local_err);
If read-only=off, but auto-read-only=on is given, open the volume read-write if we have the permissions, but instead of erroring out for read-only volumes, just degrade to read-only. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- block/iscsi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)