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 /cli/src/cli-cmd-parser.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 'cli/src/cli-cmd-parser.c')
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index 5278a3ebfcb..cd0370acc78 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -159,11 +159,7 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options int32_t index = 0; char *bricks = NULL; int32_t brick_count = 0; - char *opwords[] = { "replica", "stripe", "transport", -#ifdef HAVE_BD_XLATOR - "device", -#endif - NULL }; + char *opwords[] = { "replica", "stripe", "transport", NULL }; char *invalid_volnames[] = {"volume", "type", "subvolumes", "option", "end-volume", "all", "volume_not_in_ring", @@ -172,9 +168,6 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options int op_count = 0; int32_t replica_count = 1; int32_t stripe_count = 1; -#ifdef HAVE_BD_XLATOR - char *dev_type = NULL; -#endif gf_boolean_t is_force = _gf_false; int wc = wordcount; @@ -311,26 +304,7 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options goto out; } index += 2; - } -#ifdef HAVE_BD_XLATOR - else if ((strcmp (w, "device")) == 0) { - if (dev_type) { - cli_err ("'device' option given more" - " than one time"); - goto out; - } - if ((strcasecmp (words[index+1], "vg") == 0)) { - dev_type = gf_strdup ("vg"); - } else { - gf_log ("", GF_LOG_ERROR, "incorrect" - " device type specified"); - ret = -1; - goto out; - } - index += 2; - } -#endif - else { + } else { GF_ASSERT (!"opword mismatch"); ret = -1; goto out; @@ -371,19 +345,6 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options goto out; } - /* BD xlator does not support multiple bricks */ -#ifdef HAVE_BD_XLATOR - if (brick_count > 1 && dev_type) { - cli_err ("Block Device backend volume does not support multiple" - " bricks"); - gf_log ("", GF_LOG_ERROR, - "Block Device backend volume does not support multiple" - " bricks"); - ret = -1; - goto out; - } -#endif - if (brick_count % sub_count) { if (type == GF_CLUSTER_TYPE_STRIPE) cli_err ("number of bricks is not a multiple of " @@ -417,14 +378,6 @@ cli_cmd_volume_create_parse (const char **words, int wordcount, dict_t **options if (ret) goto out; -#ifdef HAVE_BD_XLATOR - if (dev_type) { - ret = dict_set_dynstr (dict, "device", dev_type); - if (ret) - goto out; - } -#endif - ret = dict_set_int32 (dict, "count", brick_count); if (ret) goto out; |