14f8ab
From 469cb9e16d46f075caf609ddcb12a7c02d73ce8b Mon Sep 17 00:00:00 2001
14f8ab
From: Mohammed Rafi KC <rkavunga@redhat.com>
14f8ab
Date: Thu, 11 Jul 2019 12:50:24 +0530
14f8ab
Subject: [PATCH 248/255] Revert "shd/mux: Fix coverity issues introduced by
14f8ab
 shd mux patch"
14f8ab
14f8ab
This reverts commit 0021a4bbc9af2bfe28d4a79f76c3cd33f23dd118.
14f8ab
14f8ab
BUG: 1471742
14f8ab
Change-Id: I0749328412ed3cc7ae5d64baea7a90b63b489a08
14f8ab
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/175957
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
14f8ab
---
14f8ab
 libglusterfs/src/graph.c                        | 21 ++++++++-------------
14f8ab
 xlators/mgmt/glusterd/src/glusterd-shd-svc.c    |  6 ------
14f8ab
 xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 24 +++++++-----------------
14f8ab
 3 files changed, 15 insertions(+), 36 deletions(-)
14f8ab
14f8ab
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
14f8ab
index 4c8b02d..a492dd8 100644
14f8ab
--- a/libglusterfs/src/graph.c
14f8ab
+++ b/libglusterfs/src/graph.c
14f8ab
@@ -1470,9 +1470,7 @@ glusterfs_process_svc_detach(glusterfs_ctx_t *ctx, gf_volfile_t *volfile_obj)
14f8ab
         goto out;
14f8ab
     parent_graph = ctx->active;
14f8ab
     graph = volfile_obj->graph;
14f8ab
-    if (!graph)
14f8ab
-        goto out;
14f8ab
-    if (graph->first)
14f8ab
+    if (graph && graph->first)
14f8ab
         xl = graph->first;
14f8ab
 
14f8ab
     last_xl = graph->last_xl;
14f8ab
@@ -1593,10 +1591,12 @@ glusterfs_process_svc_attach_volfp(glusterfs_ctx_t *ctx, FILE *fp,
14f8ab
     parent_graph->leaf_count += graph->leaf_count;
14f8ab
     parent_graph->id++;
14f8ab
 
14f8ab
-    volfile_obj = GF_CALLOC(1, sizeof(gf_volfile_t), gf_common_volfile_t);
14f8ab
     if (!volfile_obj) {
14f8ab
-        ret = -1;
14f8ab
-        goto out;
14f8ab
+        volfile_obj = GF_CALLOC(1, sizeof(gf_volfile_t), gf_common_volfile_t);
14f8ab
+        if (!volfile_obj) {
14f8ab
+            ret = -1;
14f8ab
+            goto out;
14f8ab
+        }
14f8ab
     }
14f8ab
 
14f8ab
     graph->used = 1;
14f8ab
@@ -1641,7 +1641,6 @@ glusterfs_mux_volfile_reconfigure(FILE *newvolfile_fp, glusterfs_ctx_t *ctx,
14f8ab
 {
14f8ab
     glusterfs_graph_t *oldvolfile_graph = NULL;
14f8ab
     glusterfs_graph_t *newvolfile_graph = NULL;
14f8ab
-    char vol_id[NAME_MAX + 1];
14f8ab
 
14f8ab
     int ret = -1;
14f8ab
 
14f8ab
@@ -1673,9 +1672,6 @@ glusterfs_mux_volfile_reconfigure(FILE *newvolfile_fp, glusterfs_ctx_t *ctx,
14f8ab
     glusterfs_graph_prepare(newvolfile_graph, ctx, newvolfile_graph->first);
14f8ab
 
14f8ab
     if (!is_graph_topology_equal(oldvolfile_graph, newvolfile_graph)) {
14f8ab
-        ret = snprintf(vol_id, sizeof(vol_id), "%s", volfile_obj->vol_id);
14f8ab
-        if (ret < 0)
14f8ab
-            goto out;
14f8ab
         ret = glusterfs_process_svc_detach(ctx, volfile_obj);
14f8ab
         if (ret) {
14f8ab
             gf_msg("glusterfsd-mgmt", GF_LOG_ERROR, EINVAL,
14f8ab
@@ -1684,9 +1680,8 @@ glusterfs_mux_volfile_reconfigure(FILE *newvolfile_fp, glusterfs_ctx_t *ctx,
14f8ab
                    "old graph. Aborting the reconfiguration operation");
14f8ab
             goto out;
14f8ab
         }
14f8ab
-        volfile_obj = NULL;
14f8ab
-        ret = glusterfs_process_svc_attach_volfp(ctx, newvolfile_fp, vol_id,
14f8ab
-                                                 checksum);
14f8ab
+        ret = glusterfs_process_svc_attach_volfp(ctx, newvolfile_fp,
14f8ab
+                                                 volfile_obj->vol_id, checksum);
14f8ab
         goto out;
14f8ab
     }
14f8ab
 
14f8ab
diff --git a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
14f8ab
index 19eca9f..4789843 100644
14f8ab
--- a/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
14f8ab
+++ b/xlators/mgmt/glusterd/src/glusterd-shd-svc.c
14f8ab
@@ -101,8 +101,6 @@ glusterd_shdsvc_init(void *data, glusterd_conn_t *mux_conn,
14f8ab
         svc->conn.rpc = rpc_clnt_ref(mux_svc->rpc);
14f8ab
         ret = snprintf(svc->conn.sockpath, sizeof(svc->conn.sockpath), "%s",
14f8ab
                        mux_conn->sockpath);
14f8ab
-        if (ret < 0)
14f8ab
-            goto out;
14f8ab
     } else {
14f8ab
         ret = mkdir_p(logdir, 0755, _gf_true);
14f8ab
         if ((ret == -1) && (EEXIST != errno)) {
14f8ab
@@ -675,10 +673,6 @@ glusterd_shdsvc_stop(glusterd_svc_t *svc, int sig)
14f8ab
         glusterd_volinfo_ref(volinfo);
14f8ab
         svc_proc->data = volinfo;
14f8ab
         ret = glusterd_svc_stop(svc, sig);
14f8ab
-        if (ret) {
14f8ab
-            glusterd_volinfo_unref(volinfo);
14f8ab
-            goto out;
14f8ab
-        }
14f8ab
     }
14f8ab
     if (!empty && pid != -1) {
14f8ab
         ret = glusterd_detach_svc(svc, volinfo, sig);
14f8ab
diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
14f8ab
index 02945b1..e42703c 100644
14f8ab
--- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
14f8ab
+++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c
14f8ab
@@ -411,14 +411,9 @@ __gf_find_compatible_svc(gd_node_type daemon)
14f8ab
     conf = THIS->private;
14f8ab
     GF_VALIDATE_OR_GOTO("glusterd", conf, out);
14f8ab
 
14f8ab
-    switch (daemon) {
14f8ab
-        case GD_NODE_SHD: {
14f8ab
-            svc_procs = &conf->shd_procs;
14f8ab
-            if (!svc_procs)
14f8ab
-                goto out;
14f8ab
-        } break;
14f8ab
-        default:
14f8ab
-            /* Add support for other client daemons here */
14f8ab
+    if (daemon == GD_NODE_SHD) {
14f8ab
+        svc_procs = &conf->shd_procs;
14f8ab
+        if (!svc_procs)
14f8ab
             goto out;
14f8ab
     }
14f8ab
 
14f8ab
@@ -545,16 +540,11 @@ __gf_find_compatible_svc_from_pid(gd_node_type daemon, pid_t pid)
14f8ab
     if (!conf)
14f8ab
         return NULL;
14f8ab
 
14f8ab
-    switch (daemon) {
14f8ab
-        case GD_NODE_SHD: {
14f8ab
-            svc_procs = &conf->shd_procs;
14f8ab
-            if (!svc_procs)
14f8ab
-                return NULL;
14f8ab
-        } break;
14f8ab
-        default:
14f8ab
-            /* Add support for other client daemons here */
14f8ab
+    if (daemon == GD_NODE_SHD) {
14f8ab
+        svc_procs = &conf->shd_procs;
14f8ab
+        if (!svc_proc)
14f8ab
             return NULL;
14f8ab
-    }
14f8ab
+    } /* Can be moved to switch when mux is implemented for other daemon; */
14f8ab
 
14f8ab
     cds_list_for_each_entry(svc_proc, svc_procs, svc_proc_list)
14f8ab
     {
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab