From 7afea5eeef61d3f29496b15ba54defeb39161588 Mon Sep 17 00:00:00 2001 From: Barak Sason Date: Sun, 18 Aug 2019 15:54:11 +0300 Subject: cluster/afr - Unused variables -Minor change to if-else structure to avoid code duplication. -Added logging in case method calls fails CID: 1394654 Updates: bz#789278 Change-Id: Ibef4450dc89ddd3bf951303d5b87f503924fd250 Signed-off-by: Barak Sason --- xlators/cluster/afr/src/afr-common.c | 11 ++++++++--- xlators/cluster/afr/src/afr-self-heal-common.c | 4 +--- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index a1d9148915b..0b5cedf588f 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1318,17 +1318,22 @@ afr_inode_refresh_subvol_cbk(call_frame_t *frame, void *cookie, xlator_t *this, if (xdata) local->replies[call_child].xdata = dict_ref(xdata); } + if (xdata) { ret = dict_get_int8(xdata, "link-count", &need_heal); - local->replies[call_child].need_heal = need_heal; - } else { - local->replies[call_child].need_heal = need_heal; + if (ret) { + gf_msg_debug(this->name, -ret, "Unable to get link count"); + } } + local->replies[call_child].need_heal = need_heal; call_count = afr_frame_return(frame); if (call_count == 0) { afr_set_need_heal(this, local); ret = afr_inode_refresh_err(frame, this); + if (ret) { + gf_msg_debug(this->name, ret, "afr_inode_refresh_err failed"); + } afr_inode_refresh_done(frame, this, ret); } } diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 4dc38e14099..b62b4f8ebaa 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1772,11 +1772,9 @@ afr_selfheal_discover_cbk(call_frame_t *frame, void *cookie, xlator_t *this, if (xdata) { local->replies[i].xdata = dict_ref(xdata); ret = dict_get_int8(xdata, "link-count", &need_heal); - local->replies[i].need_heal = need_heal; - } else { - local->replies[i].need_heal = need_heal; } + local->replies[i].need_heal = need_heal; syncbarrier_wake(&local->barrier); return 0; -- cgit