diff options
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.h | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 2 | 
3 files changed, 5 insertions, 1 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index fcffccc07b8..ae03a40e567 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -335,7 +335,7 @@ glusterd_add_volume_detail_to_dict (glusterd_volinfo_t *volinfo,          char                    *volume_id_str  = NULL;          struct args_pack        pack = {0,};          xlator_t                *this = NULL; -        int                     caps = 0; +        GF_UNUSED int           caps = 0;          GF_ASSERT (volinfo);          GF_ASSERT (volumes); diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.h b/xlators/mgmt/glusterd/src/glusterd-op-sm.h index 498c869a025..62f991933c8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.h +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.h @@ -286,7 +286,9 @@ glusterd_check_gsync_running (glusterd_volinfo_t *volinfo, gf_boolean_t *flag);  int  glusterd_defrag_volume_node_rsp (dict_t *req_dict, dict_t *rsp_dict,                                   dict_t *op_ctx); +#ifdef HAVE_BD_XLATOR  int  glusterd_is_valid_vg (glusterd_brickinfo_t *brick, int check_tag, char *msg); +#endif  #endif diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c index 561ff652d81..ad33227019c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c @@ -812,11 +812,13 @@ glusterd_op_stage_create_volume (dict_t *dict, char **op_errstr)                  }                  if (!uuid_compare (brick_info->uuid, MY_UUID)) { +#ifdef HAVE_BD_XLATOR                          if (brick_info->vg[0]) {                                  ret = glusterd_is_valid_vg (brick_info, 1, msg);                                  if (ret)                                          goto out;                          } +#endif                          ret = glusterd_validate_and_create_brickpath (brick_info,                                                            volume_uuid, op_errstr,                                                            is_force);  | 
