[v4,12/25] quorum: Make bdrv_dirname() return NULL
diff mbox

Message ID 20170116204921.31578-5-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz Jan. 16, 2017, 8:49 p.m. UTC
While the common implementation for bdrv_dirname() should return NULL
for quorum BDSs already (because they do not have a file node and their
exact_filename field should be empty), there is no reason not to make
that explicit.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/quorum.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Eric Blake Jan. 16, 2017, 11:13 p.m. UTC | #1
On 01/16/2017 02:49 PM, Max Reitz wrote:
> While the common implementation for bdrv_dirname() should return NULL
> for quorum BDSs already (because they do not have a file node and their
> exact_filename field should be empty), there is no reason not to make
> that explicit.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  block/quorum.c | 11 +++++++++++
>  1 file changed, 11 insertions(+)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

Patch
diff mbox

diff --git a/block/quorum.c b/block/quorum.c
index 112370eea2..3b5da08ec3 100644
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -1105,6 +1105,16 @@  static void quorum_refresh_filename(BlockDriverState *bs, QDict *options)
     bs->full_open_options = opts;
 }
 
+static char *quorum_dirname(BlockDriverState *bs, Error **errp)
+{
+    /* In general, there are multiple BDSs with different dirnames below this
+     * one; so there is no unique dirname we could return (unless all are equal
+     * by chance, or there is only one). Therefore, to be consistent, just
+     * always return NULL. */
+    error_setg(errp, "Cannot generate a base directory for quorum nodes");
+    return NULL;
+}
+
 static BlockDriver bdrv_quorum = {
     .format_name                        = "quorum",
     .protocol_name                      = "quorum",
@@ -1114,6 +1124,7 @@  static BlockDriver bdrv_quorum = {
     .bdrv_file_open                     = quorum_open,
     .bdrv_close                         = quorum_close,
     .bdrv_refresh_filename              = quorum_refresh_filename,
+    .bdrv_dirname                       = quorum_dirname,
 
     .bdrv_co_flush_to_disk              = quorum_co_flush,