diff options
| -rw-r--r-- | libglusterfs/src/options.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-rebalance.c | 3 | 
2 files changed, 3 insertions, 4 deletions
diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index de5a745449e..c8f2585ae2b 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -183,13 +183,13 @@ xlator_option_validate_bool (xlator_t *xl, const char *key, const char *value,  {          int          ret = -1;          char         errstr[256]; -        gf_boolean_t bool; +        gf_boolean_t is_valid;          /* Check if the value is one of             '0|1|on|off|no|yes|true|false|enable|disable' */ -        if (gf_string2boolean (value, &bool) != 0) { +        if (gf_string2boolean (value, &is_valid) != 0) {                  snprintf (errstr, 256,                            "option %s %s: '%s' is not a valid boolean value",                            key, value, value); diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c index 3d549b0fb00..ac73a090637 100644 --- a/xlators/cluster/dht/src/dht-rebalance.c +++ b/xlators/cluster/dht/src/dht-rebalance.c @@ -1838,7 +1838,6 @@ gf_defrag_task (void *opaque)          struct dht_container    *iterator       = NULL;          gf_defrag_info_t        *defrag         = NULL;          int                      ret            = 0; -        gf_boolean_t             true           = _gf_true;          defrag = (gf_defrag_info_t *)opaque; @@ -1861,7 +1860,7 @@ gf_defrag_task (void *opaque)            crawler does not go far ahead in filling up the queue.          */ -        while (true) { +        while (_gf_true) {                  if (defrag->defrag_status != GF_DEFRAG_STATUS_STARTED) {                          goto out;  | 
