[ovs-dev] [PATCH 2/3] ovsdb-monitor: Fix valgrind 'possible loss' warnings.

[Joe Stringer]

By placing these nodes at the start of their respective structures,
several "possibly lost" warnings from valgrind are silenced.

Fixes: 60e0cd041958 ("ovsdb: Replication usability improvements")
Signed-off-by: Joe Stringer <joe at ovn.org>
---
Also affects branch-2.6.
---
 ovsdb/jsonrpc-server.c | 2 +-
 ovsdb/monitor.c        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 427026d66afc..87fc240b7028 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1102,9 +1102,9 @@ ovsdb_jsonrpc_trigger_complete_done(struct ovsdb_jsonrpc_session *s)
 
 /* Jsonrpc front end monitor. */
 struct ovsdb_jsonrpc_monitor {
+    struct hmap_node node;      /* In ovsdb_jsonrpc_session's "monitors". */
     struct ovsdb_jsonrpc_session *session;
     struct ovsdb *db;
-    struct hmap_node node;      /* In ovsdb_jsonrpc_session's "monitors". */
     struct json *monitor_id;
     struct ovsdb_monitor *dbmon;
     uint64_t unflushed;         /* The first transaction that has not been
diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c
index 5320c7db0514..d15292d106bc 100644
--- a/ovsdb/monitor.c
+++ b/ovsdb/monitor.c
@@ -86,8 +86,8 @@ struct ovsdb_monitor_json_cache_node {
 };
 
 struct jsonrpc_monitor_node {
-    struct ovsdb_jsonrpc_monitor *jsonrpc_monitor;
     struct ovs_list node;
+    struct ovsdb_jsonrpc_monitor *jsonrpc_monitor;
 };
 
 /* A particular column being monitored. */
@@ -116,12 +116,12 @@ struct ovsdb_monitor_row {
  * 'transaction' stores the first update's transaction id.
  * */
 struct ovsdb_monitor_changes {
+    struct hmap_node hmap_node;  /* Element in ovsdb_monitor_tables' changes
+                                    hmap.  */
     struct ovsdb_monitor_table *mt;
     struct hmap rows;
     int n_refs;
     uint64_t transaction;
-    struct hmap_node hmap_node;  /* Element in ovsdb_monitor_tables' changes
-                                    hmap.  */
 };
 
 /* A particular table being monitored. */
-- 
2.9.3