diff options
author | Pranith Kumar K <pkarampu@redhat.com> | 2018-12-02 15:35:09 +0530 |
---|---|---|
committer | Amar Tumballi <amarts@redhat.com> | 2018-12-17 17:19:00 +0000 |
commit | c228f0c2d94c028619088c07b66f88488f7c3335 (patch) | |
tree | c312f100b984ae36ec2d4e865194743a47f44769 /xlators/cluster/afr/src/afr-self-heal-data.c | |
parent | bdcb2d8497d77ff28cb031ae3992eb7ea0c90486 (diff) |
Don't depend on string options to be valid always
updates bz#1650403
Change-Id: Ib5a11e691599ce4bd93c1ed5aca6060592893961
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-data.c')
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 1dd18b363e0..6dd38ef633a 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -15,11 +15,6 @@ #include "afr-messages.h" #include <glusterfs/events.h> -enum { - AFR_SELFHEAL_DATA_FULL = 0, - AFR_SELFHEAL_DATA_DIFF, -}; - #define HAS_HOLES(i) ((i->ia_blocks * 512) < (i->ia_size)) static int __checksum_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, @@ -301,7 +296,7 @@ afr_data_self_heal_type_get(afr_private_t *priv, unsigned char *healed_sinks, int type = AFR_SELFHEAL_DATA_FULL; int i = 0; - if (priv->data_self_heal_algorithm == NULL) { + if (priv->data_self_heal_algorithm == AFR_SELFHEAL_DATA_DYNAMIC) { type = AFR_SELFHEAL_DATA_FULL; for (i = 0; i < priv->child_count; i++) { if (!healed_sinks[i] && i != source) @@ -311,10 +306,8 @@ afr_data_self_heal_type_get(afr_private_t *priv, unsigned char *healed_sinks, break; } } - } else if (strcmp(priv->data_self_heal_algorithm, "full") == 0) { - type = AFR_SELFHEAL_DATA_FULL; - } else if (strcmp(priv->data_self_heal_algorithm, "diff") == 0) { - type = AFR_SELFHEAL_DATA_DIFF; + } else { + type = priv->data_self_heal_algorithm; } return type; } |