52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From 83f682c20418e556f2ef280b0cddfd2df41f8d9f Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Thu, 10 Jan 2019 12:44:35 +0000
|
|
Subject: [PATCH 05/14] nbd: Support auto-read-only option
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
Message-id: <20190110124442.30132-6-kwolf@redhat.com>
|
|
Patchwork-id: 83953
|
|
O-Subject: [RHEL-8.0 qemu-kvm PATCH 05/12] nbd: Support auto-read-only option
|
|
Bugzilla: 1644996
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
|
If read-only=off, but auto-read-only=on is given, open a read-write NBD
|
|
connection if the server provides a read-write export, but instead of
|
|
erroring out for read-only exports, just degrade to read-only.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
(cherry picked from commit 6c2e581d4d7751f035e9bac0384703879c8a1538)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
block/nbd-client.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/block/nbd-client.c b/block/nbd-client.c
|
|
index 98637c0..80d3625 100644
|
|
--- a/block/nbd-client.c
|
|
+++ b/block/nbd-client.c
|
|
@@ -988,11 +988,11 @@ int nbd_client_init(BlockDriverState *bs,
|
|
logout("Failed to negotiate with the NBD server\n");
|
|
return ret;
|
|
}
|
|
- if (client->info.flags & NBD_FLAG_READ_ONLY &&
|
|
- !bdrv_is_read_only(bs)) {
|
|
- error_setg(errp,
|
|
- "request for write access conflicts with read-only export");
|
|
- return -EACCES;
|
|
+ if (client->info.flags & NBD_FLAG_READ_ONLY) {
|
|
+ ret = bdrv_apply_auto_read_only(bs, "NBD export is read-only", errp);
|
|
+ if (ret < 0) {
|
|
+ return ret;
|
|
+ }
|
|
}
|
|
if (client->info.flags & NBD_FLAG_SEND_FUA) {
|
|
bs->supported_write_flags = BDRV_REQ_FUA;
|
|
--
|
|
1.8.3.1
|
|
|