diff options
| author | M. Mohan Kumar <mohan@in.ibm.com> | 2013-11-13 22:44:42 +0530 | 
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-11-13 11:38:28 -0800 | 
| commit | 15a8ecd9b3eedf80881bd3dba81f16b7d2cb7c97 (patch) | |
| tree | 856377a3f077ac4ea5cb9db2950210c8d9f30fb1 /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | c1109ed6c6c7bff0df22c304158e9f392f83cf59 (diff) | |
bd_map: Remove bd_map xlator
Remove bd_map xlator and CLI related changes.
Change-Id: If7086205df1907127c1a1fa4ba603f1c48421d09
BUG: 1028672
Signed-off-by: M. Mohan Kumar <mohan@in.ibm.com>
Reviewed-on: http://review.gluster.org/5747
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 90 | 
1 files changed, 1 insertions, 89 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index cd14e36121a..b7b71adb213 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -236,19 +236,6 @@ glusterd_brick_op_build_payload (glusterd_op_t op, glusterd_brickinfo_t *brickin                  break; -#ifdef HAVE_BD_XLATOR -        case GD_OP_BD_OP: -        { -                brick_req = GF_CALLOC (1, sizeof (*brick_req), -                                       gf_gld_mt_mop_brick_req_t); -                if (!brick_req) -                        goto out; - -                brick_req->op = GLUSTERD_BRICK_BD_OP; -                brick_req->name = ""; -        } -                break; -#endif          default:                  goto out;          break; @@ -2761,9 +2748,6 @@ glusterd_op_build_payload (dict_t **req, char **op_errstr, dict_t *op_ctx)                  case GD_OP_STATEDUMP_VOLUME:                  case GD_OP_CLEARLOCKS_VOLUME:                  case GD_OP_DEFRAG_BRICK_VOLUME: -#ifdef HAVE_BD_XLATOR -                case GD_OP_BD_OP: -#endif                          {                                  ret = dict_get_str (dict, "volname", &volname);                                  if (ret) { @@ -4083,11 +4067,6 @@ glusterd_op_stage_validate (glusterd_op_t op, dict_t *dict, char **op_errstr,                          ret = glusterd_op_stage_clearlocks_volume (dict,                                                                     op_errstr);                          break; -#ifdef HAVE_BD_XLATOR -                case GD_OP_BD_OP: -                        ret = glusterd_op_stage_bd (dict, op_errstr); -                        break; -#endif                  case GD_OP_COPY_FILE:                          ret = glusterd_op_stage_copy_file (dict, op_errstr); @@ -4199,11 +4178,6 @@ glusterd_op_commit_perform (glusterd_op_t op, dict_t *dict, char **op_errstr,                          ret = glusterd_op_clearlocks_volume (dict, op_errstr,                                                               rsp_dict);                          break; -#ifdef HAVE_BD_XLATOR -                case GD_OP_BD_OP: -                        ret = 0; -                        break; -#endif                  case GD_OP_COPY_FILE:                          ret = glusterd_op_copy_file (dict, op_errstr); @@ -4688,61 +4662,6 @@ _select_rxlators_for_full_self_heal (xlator_t *this,          return rxlator_count;  } -#ifdef HAVE_BD_XLATOR -static int -glusterd_bricks_select_bd (dict_t *dict, char **op_errstr) -{ -        int                        ret           = -1; -        glusterd_conf_t            *priv         = NULL; -        xlator_t                   *this         = NULL; -        glusterd_pending_node_t    *pending_node = NULL; -        glusterd_volinfo_t         *volinfo      = NULL; -        char                       *volname      = NULL; -        glusterd_brickinfo_t       *brickinfo    = NULL; -        int                         brick_index  = -1; - -        this = THIS; -        GF_ASSERT (this); -        priv = this->private; -        GF_ASSERT (priv); - -        ret = dict_get_str (dict, "volname", &volname); -        if (ret) { -                gf_log (this->name, GF_LOG_ERROR, "Unable to get volname"); -                goto out; -        } -        ret = glusterd_volinfo_find (volname, &volinfo); -        if (ret) -                goto out; - -        pending_node = GF_CALLOC (1, sizeof (*pending_node), -                                  gf_gld_mt_pending_node_t); -        if (!pending_node) { -                ret = -1; -                goto out; -        } - -        list_for_each_entry (brickinfo, &volinfo->bricks, brick_list) { -                brick_index++; -                if (uuid_compare (brickinfo->uuid, MY_UUID) || -                    !glusterd_is_brick_started (brickinfo)) { -                        continue; -                } -                pending_node->node = brickinfo; -                pending_node->type = GD_NODE_BRICK; -                pending_node->index = brick_index; -                list_add_tail (&pending_node->list, -                               &opinfo.pending_bricks); -                pending_node = NULL; -        } - -        ret = 0; - -out: -        gf_log (THIS->name, GF_LOG_DEBUG, "Returning ret %d", ret); -        return ret; -} -#endif  static int  fill_shd_status_for_local_bricks (dict_t *dict, glusterd_volinfo_t *volinfo, @@ -5296,11 +5215,7 @@ glusterd_op_bricks_select (glusterd_op_t op, dict_t *dict, char **op_errstr,                  ret = glusterd_bricks_select_rebalance_volume (dict, op_errstr,                                                                 selected);                  break; -#ifdef HAVE_BD_XLATOR -        case GD_OP_BD_OP: -                ret = glusterd_bricks_select_bd (dict, op_errstr); -                break; -#endif +          default:                  break;           } @@ -5873,9 +5788,6 @@ glusterd_op_free_ctx (glusterd_op_t op, void *ctx)                  case GD_OP_STATEDUMP_VOLUME:                  case GD_OP_CLEARLOCKS_VOLUME:                  case GD_OP_DEFRAG_BRICK_VOLUME: -#ifdef HAVE_BD_XLATOR -                case GD_OP_BD_OP: -#endif                          dict_unref (ctx);                          break;                  default:  | 
