From ec629963d61c3ec084c95366eec5ee3a976b1213 Mon Sep 17 00:00:00 2001

From: Mohammed Rafi KC <rkavunga@redhat.com>

Date: Thu, 11 Jul 2019 12:57:45 +0530

Subject: [PATCH 250/255] Revert "mgmt/shd: Implement multiplexing in self heal

 daemon"

This reverts commit 2cede2b87fb3e3e0673be9cf67e7d6eec3f7879c.

BUG: 1471742

Change-Id: I3830d9189dfdb567a44935aa97dc963f4594dfdb

fixes: bz#1471742

Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/175959

Tested-by: RHGS Build Bot <nigelb@redhat.com>

Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>

---

 glusterfsd/src/glusterfsd-messages.h               |   2 +-

 glusterfsd/src/glusterfsd-mgmt.c                   | 238 +------

 glusterfsd/src/glusterfsd.c                        |  20 +-

 libglusterfs/src/defaults-tmpl.c                   |  19 +-

 libglusterfs/src/glusterfs/glusterfs.h             |   7 -

 libglusterfs/src/glusterfs/libglusterfs-messages.h |   4 +-

 libglusterfs/src/glusterfs/xlator.h                |   3 -

 libglusterfs/src/graph.c                           | 451 -------------

 libglusterfs/src/graph.y                           |   3 -

 libglusterfs/src/libglusterfs.sym                  |   5 -

 libglusterfs/src/statedump.c                       |   3 +-

 libglusterfs/src/xlator.c                          |  16 -

 rpc/rpc-lib/src/protocol-common.h                  |   2 -

 tests/basic/glusterd/heald.t                       |  49 +-

 .../reset-brick-and-daemons-follow-quorum.t        |   8 +-

 tests/volume.rc                                    |   6 +-

 xlators/mgmt/glusterd/src/Makefile.am              |   6 +-

 xlators/mgmt/glusterd/src/glusterd-brick-ops.c     |   2 +-

 xlators/mgmt/glusterd/src/glusterd-conn-mgmt.c     |  42 --

 xlators/mgmt/glusterd/src/glusterd-conn-mgmt.h     |   4 +-

 xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc.c  |   3 +-

 xlators/mgmt/glusterd/src/glusterd-handler.c       |  11 +-

 xlators/mgmt/glusterd/src/glusterd-handshake.c     |  21 -

 xlators/mgmt/glusterd/src/glusterd-mem-types.h     |   1 -

 xlators/mgmt/glusterd/src/glusterd-messages.h      |   4 +-

 xlators/mgmt/glusterd/src/glusterd-op-sm.c         |  84 +--

 .../mgmt/glusterd/src/glusterd-shd-svc-helper.c    | 140 ----

 .../mgmt/glusterd/src/glusterd-shd-svc-helper.h    |  45 --

 xlators/mgmt/glusterd/src/glusterd-shd-svc.c       | 540 ++--------------

 xlators/mgmt/glusterd/src/glusterd-shd-svc.h       |  17 +-

 xlators/mgmt/glusterd/src/glusterd-sm.c            |  12 +-

 xlators/mgmt/glusterd/src/glusterd-snapd-svc.c     |   3 +-

 xlators/mgmt/glusterd/src/glusterd-statedump.c     |   3 +

 xlators/mgmt/glusterd/src/glusterd-svc-helper.c    | 715 +--------------------

 xlators/mgmt/glusterd/src/glusterd-svc-helper.h    |  40 +-

 xlators/mgmt/glusterd/src/glusterd-svc-mgmt.c      | 246 ++-----

 xlators/mgmt/glusterd/src/glusterd-svc-mgmt.h      |  27 -

 xlators/mgmt/glusterd/src/glusterd-tier.c          |   3 +-

 xlators/mgmt/glusterd/src/glusterd-tierd-svc.c     |   4 +-

 xlators/mgmt/glusterd/src/glusterd-utils.c         | 137 +---

 xlators/mgmt/glusterd/src/glusterd-utils.h         |   4 -

 xlators/mgmt/glusterd/src/glusterd-volgen.c        |  60 +-

 xlators/mgmt/glusterd/src/glusterd-volgen.h        |  11 +-

 xlators/mgmt/glusterd/src/glusterd-volume-ops.c    |   8 +-

 xlators/mgmt/glusterd/src/glusterd.c               |  12 +-

 xlators/mgmt/glusterd/src/glusterd.h               |  30 +-

 xlators/protocol/client/src/client.c               |  31 +-

 47 files changed, 292 insertions(+), 2810 deletions(-)

 delete mode 100644 xlators/mgmt/glusterd/src/glusterd-shd-svc-helper.c

 delete mode 100644 xlators/mgmt/glusterd/src/glusterd-shd-svc-helper.h

diff --git a/glusterfsd/src/glusterfsd-messages.h b/glusterfsd/src/glusterfsd-messages.h

index 280624c..ce6c8ca 100644

--- a/glusterfsd/src/glusterfsd-messages.h

+++ b/glusterfsd/src/glusterfsd-messages.h

@@ -36,6 +36,6 @@ GLFS_MSGID(GLUSTERFSD, glusterfsd_msg_1, glusterfsd_msg_2, glusterfsd_msg_3,

            glusterfsd_msg_31, glusterfsd_msg_32, glusterfsd_msg_33,

            glusterfsd_msg_34, glusterfsd_msg_35, glusterfsd_msg_36,

            glusterfsd_msg_37, glusterfsd_msg_38, glusterfsd_msg_39,

-           glusterfsd_msg_40, glusterfsd_msg_41, glusterfsd_msg_42, glusterfsd_msg_43);

+           glusterfsd_msg_40);

 #endif /* !_GLUSTERFSD_MESSAGES_H_ */

diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c

index 1d2cd1a..15acc10 100644

--- a/glusterfsd/src/glusterfsd-mgmt.c

+++ b/glusterfsd/src/glusterfsd-mgmt.c

@@ -48,20 +48,7 @@ int

 glusterfs_graph_unknown_options(glusterfs_graph_t *graph);

 int

 emancipate(glusterfs_ctx_t *ctx, int ret);

-int

-glusterfs_process_svc_attach_volfp(glusterfs_ctx_t *ctx, FILE *fp,

-                                   char *volfile_id, char *checksum);

-int

-glusterfs_mux_volfile_reconfigure(FILE *newvolfile_fp, glusterfs_ctx_t *ctx,

-                                  gf_volfile_t *volfile_obj, char *checksum);

-int

-glusterfs_process_svc_attach_volfp(glusterfs_ctx_t *ctx, FILE *fp,

-                                   char *volfile_id, char *checksum);

-int

-glusterfs_process_svc_detach(glusterfs_ctx_t *ctx, gf_volfile_t *volfile_obj);

-gf_boolean_t

-mgmt_is_multiplexed_daemon(char *name);

 int

 mgmt_cbk_spec(struct rpc_clnt *rpc, void *mydata, void *data)

 {

@@ -75,96 +62,6 @@ mgmt_cbk_spec(struct rpc_clnt *rpc, void *mydata, void *data)

 }

 int

-mgmt_process_volfile(const char *volfile, ssize_t size, char *volfile_id)

-{

-    glusterfs_ctx_t *ctx = NULL;

-    int ret = 0;

-    FILE *tmpfp = NULL;

-    gf_volfile_t *volfile_obj = NULL;

-    gf_volfile_t *volfile_tmp = NULL;

-    char sha256_hash[SHA256_DIGEST_LENGTH] = {

-        0,

-    };

-    int tmp_fd = -1;

-    char template[] = "/tmp/glfs.volfile.XXXXXX";

-

-    glusterfs_compute_sha256((const unsigned char *)volfile, size, sha256_hash);

-    ctx = THIS->ctx;

-    LOCK(&ctx->volfile_lock);

-    {

-        list_for_each_entry(volfile_obj, &ctx->volfile_list, volfile_list)

-        {

-            if (!strcmp(volfile_id, volfile_obj->vol_id)) {

-                if (!memcmp(sha256_hash, volfile_obj->volfile_checksum,

-                            sizeof(volfile_obj->volfile_checksum))) {

-                    UNLOCK(&ctx->volfile_lock);

-                    gf_msg(THIS->name, GF_LOG_INFO, 0, glusterfsd_msg_40,

-                           "No change in volfile, continuing");

-                    goto out;

-                }

-                volfile_tmp = volfile_obj;

-                break;

-            }

-        }

-

-        /* coverity[secure_temp] mkstemp uses 0600 as the mode */

-        tmp_fd = mkstemp(template);

-        if (-1 == tmp_fd) {

-            UNLOCK(&ctx->volfile_lock);

-            gf_msg(THIS->name, GF_LOG_ERROR, 0, glusterfsd_msg_39,

-                   "Unable to create temporary file: %s", template);

-            ret = -1;

-            goto out;

-        }

-

-        /* Calling unlink so that when the file is closed or program

-         * terminates the temporary file is deleted.

-         */

-        ret = sys_unlink(template);

-        if (ret < 0) {

-            gf_msg(THIS->name, GF_LOG_INFO, 0, glusterfsd_msg_39,

-                   "Unable to delete temporary file: %s", template);

-            ret = 0;

-        }

-

-        tmpfp = fdopen(tmp_fd, "w+b");

-        if (!tmpfp) {

-            ret = -1;

-            goto unlock;

-        }

-

-        fwrite(volfile, size, 1, tmpfp);

-        fflush(tmpfp);

-        if (ferror(tmpfp)) {

-            ret = -1;

-            goto unlock;

-        }

-

-        if (!volfile_tmp) {

-            /* There is no checksum in the list, which means simple attach

-             * the volfile

-             */

-            ret = glusterfs_process_svc_attach_volfp(ctx, tmpfp, volfile_id,

-                                                     sha256_hash);

-            goto unlock;

-        }

-        ret = glusterfs_mux_volfile_reconfigure(tmpfp, ctx, volfile_obj,

-                                                sha256_hash);

-        if (ret < 0) {

-            gf_msg_debug("glusterfsd-mgmt", EINVAL, "Reconfigure failed !!");

-        }

-    }

-unlock:

-    UNLOCK(&ctx->volfile_lock);

-out:

-    if (tmpfp)

-        fclose(tmpfp);

-    else if (tmp_fd != -1)

-        sys_close(tmp_fd);

-    return ret;

-}

-

-int

 mgmt_cbk_event(struct rpc_clnt *rpc, void *mydata, void *data)

 {

     return 0;

@@ -1069,110 +966,6 @@ glusterfs_handle_attach(rpcsvc_request_t *req)

 }

 int

-glusterfs_handle_svc_attach(rpcsvc_request_t *req)

-{

-    int32_t ret = -1;

-    gd1_mgmt_brick_op_req xlator_req = {

-        0,

-    };

-    xlator_t *this = NULL;

-    glusterfs_ctx_t *ctx = NULL;

-

-    GF_ASSERT(req);

-    this = THIS;

-    GF_ASSERT(this);

-

-    ctx = this->ctx;

-    ret = xdr_to_generic(req->msg[0], &xlator_req,

-                         (xdrproc_t)xdr_gd1_mgmt_brick_op_req);

-

-    if (ret < 0) {

-        /*failed to decode msg;*/

-        req->rpc_err = GARBAGE_ARGS;

-        goto out;

-    }

-    gf_msg(THIS->name, GF_LOG_INFO, 0, glusterfsd_msg_41,

-           "received attach "

-           "request for volfile-id=%s",

-           xlator_req.name);

-    ret = 0;

-

-    if (ctx->active) {

-        ret = mgmt_process_volfile(xlator_req.input.input_val,

-                                   xlator_req.input.input_len, xlator_req.name);

-    } else {

-        gf_msg(this->name, GF_LOG_WARNING, EINVAL, glusterfsd_msg_42,

-               "got attach for %s but no active graph", xlator_req.name);

-    }

-out:

-    if (xlator_req.input.input_val)

-        free(xlator_req.input.input_val);

-    if (xlator_req.name)

-        free(xlator_req.name);

-    glusterfs_translator_info_response_send(req, ret, NULL, NULL);

-    return 0;

-}

-

-int

-glusterfs_handle_svc_detach(rpcsvc_request_t *req)

-{

-    gd1_mgmt_brick_op_req xlator_req = {

-        0,

-    };

-    ssize_t ret;

-    glusterfs_ctx_t *ctx = NULL;

-    gf_volfile_t *volfile_obj = NULL;

-    gf_volfile_t *volfile_tmp = NULL;

-

-    ret = xdr_to_generic(req->msg[0], &xlator_req,

-                         (xdrproc_t)xdr_gd1_mgmt_brick_op_req);

-    if (ret < 0) {

-        req->rpc_err = GARBAGE_ARGS;

-        return -1;

-    }

-    ctx = glusterfsd_ctx;

-

-    LOCK(&ctx->volfile_lock);

-    {

-        list_for_each_entry(volfile_obj, &ctx->volfile_list, volfile_list)

-        {

-            if (!strcmp(xlator_req.name, volfile_obj->vol_id)) {

-                volfile_tmp = volfile_obj;

-                break;

-            }

-        }

-

-        if (!volfile_tmp) {

-            UNLOCK(&ctx->volfile_lock);

-            gf_msg(THIS->name, GF_LOG_ERROR, 0, glusterfsd_msg_41,

-                   "can't detach %s - not found", xlator_req.name);

-            /*

-             * Used to be -ENOENT.  However, the caller asked us to

-             * make sure it's down and if it's already down that's

-             * good enough.

-             */

-            ret = 0;

-            goto out;

-        }

-        ret = glusterfs_process_svc_detach(ctx, volfile_tmp);

-        if (ret) {

-            UNLOCK(&ctx->volfile_lock);

-            gf_msg("glusterfsd-mgmt", GF_LOG_ERROR, EINVAL, glusterfsd_msg_41,

-                   "Could not detach "

-                   "old graph. Aborting the reconfiguration operation");

-            goto out;

-        }

-    }

-    UNLOCK(&ctx->volfile_lock);

-out:

-    glusterfs_terminate_response_send(req, ret);

-    free(xlator_req.name);

-    xlator_req.name = NULL;

-

-    return 0;

-}

-

-int

 glusterfs_handle_dump_metrics(rpcsvc_request_t *req)

 {

     int32_t ret = -1;

@@ -2056,13 +1849,6 @@ rpcsvc_actor_t glusterfs_actors[GLUSTERD_BRICK_MAXVALUE] = {

     [GLUSTERD_DUMP_METRICS] = {"DUMP METRICS", GLUSTERD_DUMP_METRICS,

                                glusterfs_handle_dump_metrics, NULL, 0, DRC_NA},

-

-    [GLUSTERD_SVC_ATTACH] = {"ATTACH CLIENT", GLUSTERD_SVC_ATTACH,

-                             glusterfs_handle_svc_attach, NULL, 0, DRC_NA},

-

-    [GLUSTERD_SVC_DETACH] = {"DETACH CLIENT", GLUSTERD_SVC_DETACH,

-                             glusterfs_handle_svc_detach, NULL, 0, DRC_NA},

-

 };

 struct rpcsvc_program glusterfs_mop_prog = {

@@ -2210,17 +1996,14 @@ mgmt_getspec_cbk(struct rpc_req *req, struct iovec *iov, int count,

     }

 volfile:

+    ret = 0;

     size = rsp.op_ret;

-    volfile_id = frame->local;

-    if (mgmt_is_multiplexed_daemon(ctx->cmd_args.process_name)) {

-        ret = mgmt_process_volfile((const char *)rsp.spec, size, volfile_id);

-        goto post_graph_mgmt;

-    }

-    ret = 0;

     glusterfs_compute_sha256((const unsigned char *)rsp.spec, size,

                              sha256_hash);

+    volfile_id = frame->local;

+

     LOCK(&ctx->volfile_lock);

     {

         locked = 1;

@@ -2322,7 +2105,6 @@ volfile:

             }

             INIT_LIST_HEAD(&volfile_tmp->volfile_list);

-            volfile_tmp->graph = ctx->active;

             list_add(&volfile_tmp->volfile_list, &ctx->volfile_list);

             snprintf(volfile_tmp->vol_id, sizeof(volfile_tmp->vol_id), "%s",

                      volfile_id);

@@ -2334,7 +2116,6 @@ volfile:

     locked = 0;

-post_graph_mgmt:

     if (!is_mgmt_rpc_reconnect) {

         need_emancipate = 1;

         glusterfs_mgmt_pmap_signin(ctx);

@@ -2488,21 +2269,10 @@ glusterfs_volfile_fetch(glusterfs_ctx_t *ctx)

 {

     xlator_t *server_xl = NULL;

     xlator_list_t *trav;

-    gf_volfile_t *volfile_obj = NULL;

-    int ret = 0;

+    int ret;

     LOCK(&ctx->volfile_lock);

     {

-        if (ctx->active &&

-            mgmt_is_multiplexed_daemon(ctx->cmd_args.process_name)) {

-            list_for_each_entry(volfile_obj, &ctx->volfile_list, volfile_list)

-            {

-                ret |= glusterfs_volfile_fetch_one(ctx, volfile_obj->vol_id);

-            }

-            UNLOCK(&ctx->volfile_lock);

-            return ret;

-        }

-

         if (ctx->active) {

             server_xl = ctx->active->first;

             if (strcmp(server_xl->type, "protocol/server") != 0) {

diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c

index 2172af4..5b5e996 100644

--- a/glusterfsd/src/glusterfsd.c

+++ b/glusterfsd/src/glusterfsd.c

@@ -2593,6 +2593,24 @@ out:

 #endif

 int

+glusterfs_graph_fini(glusterfs_graph_t *graph)

+{

+    xlator_t *trav = NULL;

+

+    trav = graph->first;

+

+    while (trav) {

+        if (trav->init_succeeded) {

+            trav->fini(trav);

+            trav->init_succeeded = 0;

+        }

+        trav = trav->next;

+    }

+

+    return 0;

+}

+

+int

 glusterfs_process_volfp(glusterfs_ctx_t *ctx, FILE *fp)

 {

     glusterfs_graph_t *graph = NULL;

@@ -2791,7 +2809,7 @@ main(int argc, char *argv[])

     /* set brick_mux mode only for server process */

     if ((ctx->process_mode != GF_SERVER_PROCESS) && cmd->brick_mux) {

-        gf_msg("glusterfs", GF_LOG_CRITICAL, 0, glusterfsd_msg_43,

+        gf_msg("glusterfs", GF_LOG_CRITICAL, 0, glusterfsd_msg_40,

                "command line argument --brick-mux is valid only for brick "

                "process");

         goto out;

diff --git a/libglusterfs/src/defaults-tmpl.c b/libglusterfs/src/defaults-tmpl.c

index 82e7f78..5bf64e8 100644

--- a/libglusterfs/src/defaults-tmpl.c

+++ b/libglusterfs/src/defaults-tmpl.c

@@ -127,12 +127,6 @@ default_notify(xlator_t *this, int32_t event, void *data, ...)

     GF_UNUSED int ret = 0;

     xlator_t *victim = data;

-    glusterfs_graph_t *graph = NULL;

-

-    GF_VALIDATE_OR_GOTO("notify", this, out);

-    graph = this->graph;

-    GF_VALIDATE_OR_GOTO(this->name, graph, out);

-

     switch (event) {

         case GF_EVENT_PARENT_UP:

         case GF_EVENT_PARENT_DOWN: {

@@ -165,17 +159,6 @@ default_notify(xlator_t *this, int32_t event, void *data, ...)

                     xlator_notify(parent->xlator, event, this, NULL);

                 parent = parent->next;

             }

-

-            if (event == GF_EVENT_CHILD_DOWN &&

-                !(this->ctx && this->ctx->master) && (graph->top == this)) {

-                /* Make sure this is not a daemon with master xlator */

-                pthread_mutex_lock(&graph->mutex);

-                {

-                    graph->used = 0;

-                    pthread_cond_broadcast(&graph->child_down_cond);

-                }

-                pthread_mutex_unlock(&graph->mutex);

-            }

         } break;

         case GF_EVENT_UPCALL: {

             xlator_list_t *parent = this->parents;

@@ -222,7 +205,7 @@ default_notify(xlator_t *this, int32_t event, void *data, ...)

              * nothing to do with readability.

              */

     }

-out:

+

     return 0;

 }

diff --git a/libglusterfs/src/glusterfs/glusterfs.h b/libglusterfs/src/glusterfs/glusterfs.h

index 9ec2365..2cedf1a 100644

--- a/libglusterfs/src/glusterfs/glusterfs.h

+++ b/libglusterfs/src/glusterfs/glusterfs.h

@@ -597,10 +597,6 @@ struct _glusterfs_graph {

     int used; /* Should be set when fuse gets

                         first CHILD_UP */

     uint32_t volfile_checksum;

-    void *last_xl; /* Stores the last xl of the graph, as of now only populated

-                      in client multiplexed code path */

-    pthread_mutex_t mutex;

-    pthread_cond_t child_down_cond; /* for broadcasting CHILD_DOWN */

 };

 typedef struct _glusterfs_graph glusterfs_graph_t;

@@ -743,7 +739,6 @@ typedef struct {

     char volfile_checksum[SHA256_DIGEST_LENGTH];

     char vol_id[NAME_MAX + 1];

     struct list_head volfile_list;

-    glusterfs_graph_t *graph;

 } gf_volfile_t;

@@ -827,6 +822,4 @@ gf_free_mig_locks(lock_migration_info_t *locks);

 int

 glusterfs_read_secure_access_file(void);

-int

-glusterfs_graph_fini(glusterfs_graph_t *graph);

 #endif /* _GLUSTERFS_H */

diff --git a/libglusterfs/src/glusterfs/libglusterfs-messages.h b/libglusterfs/src/glusterfs/libglusterfs-messages.h

index ea2aa60..1b72f6d 100644

--- a/libglusterfs/src/glusterfs/libglusterfs-messages.h

+++ b/libglusterfs/src/glusterfs/libglusterfs-messages.h

@@ -109,8 +109,6 @@ GLFS_MSGID(

     LG_MSG_PTHREAD_ATTR_INIT_FAILED, LG_MSG_INVALID_INODE_LIST,

     LG_MSG_COMPACT_FAILED, LG_MSG_COMPACT_STATUS, LG_MSG_UTIMENSAT_FAILED,

     LG_MSG_PTHREAD_NAMING_FAILED, LG_MSG_SYSCALL_RETURNS_WRONG,

-    LG_MSG_XXH64_TO_GFID_FAILED, LG_MSG_ASYNC_WARNING, LG_MSG_ASYNC_FAILURE,

-    LG_MSG_GRAPH_CLEANUP_FAILED, LG_MSG_GRAPH_SETUP_FAILED,

-    LG_MSG_GRAPH_DETACH_STARTED, LG_MSG_GRAPH_ATTACH_FAILED);

+    LG_MSG_XXH64_TO_GFID_FAILED);

 #endif /* !_LG_MESSAGES_H_ */

diff --git a/libglusterfs/src/glusterfs/xlator.h b/libglusterfs/src/glusterfs/xlator.h

index 8998976..b78daad 100644

--- a/libglusterfs/src/glusterfs/xlator.h

+++ b/libglusterfs/src/glusterfs/xlator.h

@@ -1089,7 +1089,4 @@ handle_default_options(xlator_t *xl, dict_t *options);

 void

 gluster_graph_take_reference(xlator_t *tree);

-

-gf_boolean_t

-mgmt_is_multiplexed_daemon(char *name);

 #endif /* _XLATOR_H */

diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c

index a492dd8..bb5e67a 100644

--- a/libglusterfs/src/graph.c

+++ b/libglusterfs/src/graph.c

@@ -114,53 +114,6 @@ out:

     return cert_depth;

 }

-xlator_t *

-glusterfs_get_last_xlator(glusterfs_graph_t *graph)

-{

-    xlator_t *trav = graph->first;

-    if (!trav)

-        return NULL;

-

-    while (trav->next)

-        trav = trav->next;

-

-    return trav;

-}

-

-xlator_t *

-glusterfs_mux_xlator_unlink(xlator_t *pxl, xlator_t *cxl)

-{

-    xlator_list_t *unlink = NULL;

-    xlator_list_t *prev = NULL;

-    xlator_list_t **tmp = NULL;

-    xlator_t *next_child = NULL;

-    xlator_t *xl = NULL;

-

-    for (tmp = &pxl->children; *tmp; tmp = &(*tmp)->next) {

-        if ((*tmp)->xlator == cxl) {

-            unlink = *tmp;

-            *tmp = (*tmp)->next;

-            if (*tmp)

-                next_child = (*tmp)->xlator;

-            break;

-        }

-        prev = *tmp;

-    }

-

-    if (!prev)

-        xl = pxl;

-    else if (prev->xlator)

-        xl = prev->xlator->graph->last_xl;

-

-    if (xl)

-        xl->next = next_child;

-    if (next_child)

-        next_child->prev = xl;

-

-    GF_FREE(unlink);

-    return next_child;

-}

-

 int

 glusterfs_xlator_link(xlator_t *pxl, xlator_t *cxl)

 {

@@ -1139,8 +1092,6 @@ glusterfs_graph_destroy_residual(glusterfs_graph_t *graph)

     ret = xlator_tree_free_memacct(graph->first);

     list_del_init(&graph->list);

-    pthread_mutex_destroy(&graph->mutex);

-    pthread_cond_destroy(&graph->child_down_cond);

     GF_FREE(graph);

     return ret;

@@ -1183,25 +1134,6 @@ out:

 }

 int

-glusterfs_graph_fini(glusterfs_graph_t *graph)

-{

-    xlator_t *trav = NULL;

-

-    trav = graph->first;

-

-    while (trav) {

-        if (trav->init_succeeded) {

-            trav->cleanup_starting = 1;

-            trav->fini(trav);

-            trav->init_succeeded = 0;

-        }

-        trav = trav->next;

-    }

-

-    return 0;

-}

-

-int

 glusterfs_graph_attach(glusterfs_graph_t *orig_graph, char *path,

                        glusterfs_graph_t **newgraph)

 {

@@ -1324,386 +1256,3 @@ glusterfs_graph_attach(glusterfs_graph_t *orig_graph, char *path,

     return 0;

 }

-int

-glusterfs_muxsvc_cleanup_parent(glusterfs_ctx_t *ctx,

-                                glusterfs_graph_t *parent_graph)

-{

-    if (parent_graph) {

-        if (parent_graph->first) {

-            xlator_destroy(parent_graph->first);

-        }

-        ctx->active = NULL;

-        GF_FREE(parent_graph);

-        parent_graph = NULL;

-    }

-    return 0;

-}

-

-void *

-glusterfs_graph_cleanup(void *arg)

-{

-    glusterfs_graph_t *graph = NULL;

-    glusterfs_ctx_t *ctx = THIS->ctx;

-    int ret = -1;

-    graph = arg;

-

-    if (!graph)

-        return NULL;

-

-    /* To destroy the graph, fitst sent a GF_EVENT_PARENT_DOWN

-     * Then wait for GF_EVENT_CHILD_DOWN to get on the top

-     * xl. Once we have GF_EVENT_CHILD_DOWN event, then proceed

-     * to fini.

-     *

-     * During fini call, this will take a last unref on rpc and

-     * rpc_transport_object.

-     */

-    if (graph->first)

-        default_notify(graph->first, GF_EVENT_PARENT_DOWN, graph->first);

-

-    ret = pthread_mutex_lock(&graph->mutex);

-    if (ret != 0) {

-        gf_msg("glusterfs", GF_LOG_ERROR, EAGAIN, LG_MSG_GRAPH_CLEANUP_FAILED,

-               "Failed to aquire a lock");

-        goto out;

-    }

-    /* check and wait for CHILD_DOWN for top xlator*/

-    while (graph->used) {

-        ret = pthread_cond_wait(&graph->child_down_cond, &graph->mutex);

-        if (ret != 0)

-            gf_msg("glusterfs", GF_LOG_INFO, 0, LG_MSG_GRAPH_CLEANUP_FAILED,

-                   "cond wait failed ");

-    }

-

-    ret = pthread_mutex_unlock(&graph->mutex);

-    if (ret != 0) {

-        gf_msg("glusterfs", GF_LOG_ERROR, EAGAIN, LG_MSG_GRAPH_CLEANUP_FAILED,

-               "Failed to release a lock");

-    }

-

-    /* Though we got a child down on top xlator, we have to wait until

-     * all the notifier to exit. Because there should not be any threads

-     * that access xl variables.

-     */

-    pthread_mutex_lock(&ctx->notify_lock);

-    {

-        while (ctx->notifying)

-            pthread_cond_wait(&ctx->notify_cond, &ctx->notify_lock);

-    }

-    pthread_mutex_unlock(&ctx->notify_lock);

-

-    glusterfs_graph_fini(graph);

-    glusterfs_graph_destroy(graph);

-out:

-    return NULL;

-}

-

-glusterfs_graph_t *

-glusterfs_muxsvc_setup_parent_graph(glusterfs_ctx_t *ctx, char *name,

-                                    char *type)

-{

-    glusterfs_graph_t *parent_graph = NULL;

-    xlator_t *ixl = NULL;

-    int ret = -1;

-    parent_graph = GF_CALLOC(1, sizeof(*parent_graph),

-                             gf_common_mt_glusterfs_graph_t);

-    if (!parent_graph)

-        goto out;

-

-    INIT_LIST_HEAD(&parent_graph->list);

-

-    ctx->active = parent_graph;

-    ixl = GF_CALLOC(1, sizeof(*ixl), gf_common_mt_xlator_t);

-    if (!ixl)

-        goto out;

-

-    ixl->ctx = ctx;

-    ixl->graph = parent_graph;

-    ixl->options = dict_new();