cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
26ba25
From cc9208123465166b5217d41f9a20e4b652463475 Mon Sep 17 00:00:00 2001
26ba25
From: John Snow <jsnow@redhat.com>
26ba25
Date: Wed, 18 Jul 2018 22:55:01 +0200
26ba25
Subject: [PATCH 243/268] nbd/server: refactor NBDExportMetaContexts
26ba25
26ba25
RH-Author: John Snow <jsnow@redhat.com>
26ba25
Message-id: <20180718225511.14878-26-jsnow@redhat.com>
26ba25
Patchwork-id: 81413
26ba25
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 25/35] nbd/server: refactor NBDExportMetaContexts
26ba25
Bugzilla: 1207657
26ba25
RH-Acked-by: Eric Blake <eblake@redhat.com>
26ba25
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
26ba25
RH-Acked-by: Fam Zheng <famz@redhat.com>
26ba25
26ba25
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
26ba25
Use NBDExport pointer instead of just export name: there is no need to
26ba25
store a duplicated name in the struct; moreover, NBDExport will be used
26ba25
further.
26ba25
26ba25
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
26ba25
Message-Id: <20180609151758.17343-3-vsementsov@virtuozzo.com>
26ba25
Reviewed-by: Eric Blake <eblake@redhat.com>
26ba25
[eblake: commit message grammar tweak]
26ba25
Signed-off-by: Eric Blake <eblake@redhat.com>
26ba25
(cherry picked from commit af736e546717d832168dd332a328bfcf74a0ab3d)
26ba25
Signed-off-by: John Snow <jsnow@redhat.com>
26ba25
26ba25
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
26ba25
---
26ba25
 nbd/server.c | 23 +++++++++++------------
26ba25
 1 file changed, 11 insertions(+), 12 deletions(-)
26ba25
26ba25
diff --git a/nbd/server.c b/nbd/server.c
26ba25
index 942c016..26cc41a 100644
26ba25
--- a/nbd/server.c
26ba25
+++ b/nbd/server.c
26ba25
@@ -88,7 +88,7 @@ static QTAILQ_HEAD(, NBDExport) exports = QTAILQ_HEAD_INITIALIZER(exports);
26ba25
  * as selected by NBD_OPT_SET_META_CONTEXT. Also used for
26ba25
  * NBD_OPT_LIST_META_CONTEXT. */
26ba25
 typedef struct NBDExportMetaContexts {
26ba25
-    char export_name[NBD_MAX_NAME_SIZE + 1];
26ba25
+    NBDExport *exp;
26ba25
     bool valid; /* means that negotiation of the option finished without
26ba25
                    errors */
26ba25
     bool base_allocation; /* export base:allocation context (block status) */
26ba25
@@ -399,10 +399,9 @@ static int nbd_negotiate_handle_list(NBDClient *client, Error **errp)
26ba25
     return nbd_negotiate_send_rep(client, NBD_REP_ACK, errp);
26ba25
 }
26ba25
 
26ba25
-static void nbd_check_meta_export_name(NBDClient *client)
26ba25
+static void nbd_check_meta_export(NBDClient *client)
26ba25
 {
26ba25
-    client->export_meta.valid &= !strcmp(client->exp->name,
26ba25
-                                         client->export_meta.export_name);
26ba25
+    client->export_meta.valid &= client->exp == client->export_meta.exp;
26ba25
 }
26ba25
 
26ba25
 /* Send a reply to NBD_OPT_EXPORT_NAME.
26ba25
@@ -456,7 +455,7 @@ static int nbd_negotiate_handle_export_name(NBDClient *client,
26ba25
 
26ba25
     QTAILQ_INSERT_TAIL(&client->exp->clients, client, next);
26ba25
     nbd_export_get(client->exp);
26ba25
-    nbd_check_meta_export_name(client);
26ba25
+    nbd_check_meta_export(client);
26ba25
 
26ba25
     return 0;
26ba25
 }
26ba25
@@ -650,7 +649,7 @@ static int nbd_negotiate_handle_info(NBDClient *client, uint16_t myflags,
26ba25
         client->exp = exp;
26ba25
         QTAILQ_INSERT_TAIL(&client->exp->clients, client, next);
26ba25
         nbd_export_get(client->exp);
26ba25
-        nbd_check_meta_export_name(client);
26ba25
+        nbd_check_meta_export(client);
26ba25
         rc = 1;
26ba25
     }
26ba25
     return rc;
26ba25
@@ -835,7 +834,7 @@ static int nbd_negotiate_meta_queries(NBDClient *client,
26ba25
                                       NBDExportMetaContexts *meta, Error **errp)
26ba25
 {
26ba25
     int ret;
26ba25
-    NBDExport *exp;
26ba25
+    char export_name[NBD_MAX_NAME_SIZE + 1];
26ba25
     NBDExportMetaContexts local_meta;
26ba25
     uint32_t nb_queries;
26ba25
     int i;
26ba25
@@ -854,15 +853,15 @@ static int nbd_negotiate_meta_queries(NBDClient *client,
26ba25
 
26ba25
     memset(meta, 0, sizeof(*meta));
26ba25
 
26ba25
-    ret = nbd_opt_read_name(client, meta->export_name, NULL, errp);
26ba25
+    ret = nbd_opt_read_name(client, export_name, NULL, errp);
26ba25
     if (ret <= 0) {
26ba25
         return ret;
26ba25
     }
26ba25
 
26ba25
-    exp = nbd_export_find(meta->export_name);
26ba25
-    if (exp == NULL) {
26ba25
+    meta->exp = nbd_export_find(export_name);
26ba25
+    if (meta->exp == NULL) {
26ba25
         return nbd_opt_drop(client, NBD_REP_ERR_UNKNOWN, errp,
26ba25
-                            "export '%s' not present", meta->export_name);
26ba25
+                            "export '%s' not present", export_name);
26ba25
     }
26ba25
 
26ba25
     ret = nbd_opt_read(client, &nb_queries, sizeof(nb_queries), errp);
26ba25
@@ -871,7 +870,7 @@ static int nbd_negotiate_meta_queries(NBDClient *client,
26ba25
     }
26ba25
     cpu_to_be32s(&nb_queries);
26ba25
     trace_nbd_negotiate_meta_context(nbd_opt_lookup(client->opt),
26ba25
-                                     meta->export_name, nb_queries);
26ba25
+                                     export_name, nb_queries);
26ba25
 
26ba25
     if (client->opt == NBD_OPT_LIST_META_CONTEXT && !nb_queries) {
26ba25
         /* enable all known contexts */
26ba25
-- 
26ba25
1.8.3.1
26ba25