Fixes after review

amarts · amarts · commit a6359358f88a · 2020-05-11T10:56:54.000+05:30
Change-Id: I34711960e57a54a726307e0ee17df5ecc9b36766
Signed-off-by: Amar Tumballi &lt;amar@kadalu.io&gt;
diff --git a/libglusterfs/src/glusterfs/list.h b/libglusterfs/src/glusterfs/list.h
@@ -54,7 +54,7 @@ list_add_order(struct list_head *new, struct list_head *head,
     struct list_head *pos = head->prev;
 
     while (pos != head) {
-        if (IS_SUCCESS(compare(new, pos)))
+        if (compare(new, pos) >= 0)
             break;
 
         /* Iterate the list in the reverse order. This will have
diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c
@@ -1061,7 +1061,7 @@ _gf_msg_backtrace(int stacksize, char *callstr, size_t strsize)
     ret = snprintf(callstr, strsize, "(");
     PRINT_SIZE_CHECK(ret, out, strsize);
 
-    for (IS_SUCCESS((i = size - 3); i); i--) {
+    for (i = (size - 3); i >= 0; i--) {
         ret = snprintf(callstr + savstrsize - strsize, strsize, "-->%s ",
                        callingfn[i]);
         PRINT_SIZE_CHECK(ret, out, strsize);
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
@@ -697,12 +697,9 @@ rpc_clnt_handle_cbk(struct rpc_clnt *clnt, rpc_transport_pollin_t *msg)
 
     gf_log(clnt->conn.name, GF_LOG_TRACE,
            "receivd rpc message (XID: 0x%" GF_PRI_RPC_XID
-           ", "
-           "Ver: %" GF_PRI_RPC_VERSION ", Program: %" GF_PRI_RPC_PROG_ID
-           ", "
-           "ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
-           ") "
-           "from rpc-transport (%s)",
+           ", Ver: %" GF_PRI_RPC_VERSION ", Program: %" GF_PRI_RPC_PROG_ID
+           ", ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
+           ") from rpc-transport (%s)",
            rpc_call_xid(&rpcmsg), rpc_call_rpcvers(&rpcmsg),
            rpc_call_program(&rpcmsg), rpc_call_progver(&rpcmsg),
            rpc_call_progproc(&rpcmsg), clnt->conn.name);
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
@@ -539,13 +539,9 @@ rpcsvc_request_create(rpcsvc_t *svc, rpc_transport_t *trans,
     rpcsvc_request_init(svc, trans, &rpcmsg, progmsg, msg, req);
 
     gf_log(GF_RPCSVC, GF_LOG_TRACE,
-           "received rpc-message "
-           "(XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
-           ", Program: %" GF_PRI_RPC_PROG_ID
-           ", "
-           "ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
-           ") "
-           "from rpc-transport (%s)",
+           "received rpc-message (XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
+           ", Program: %" GF_PRI_RPC_PROG_ID ", ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
+           ") from rpc-transport (%s)",
            rpc_call_xid(&rpcmsg), rpc_call_rpcvers(&rpcmsg),
            rpc_call_program(&rpcmsg), rpc_call_progver(&rpcmsg),
            rpc_call_progproc(&rpcmsg), trans->name);
@@ -561,13 +557,9 @@ rpcsvc_request_create(rpcsvc_t *svc, rpc_transport_t *trans,
         /* LOG- TODO: print rpc version, also print the peerinfo
            from transport */
         gf_log(GF_RPCSVC, GF_LOG_ERROR,
-               "RPC version not supported "
-               "(XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
-               ", Program: %" GF_PRI_RPC_PROG_ID
-               ", "
-               "ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
-               ") "
-               "from trans (%s)",
+               "RPC version not supported (XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
+               ", Program: %" GF_PRI_RPC_PROG_ID ", ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
+               ") from trans (%s)",
                rpc_call_xid(&rpcmsg), rpc_call_rpcvers(&rpcmsg),
                rpc_call_program(&rpcmsg), rpc_call_progver(&rpcmsg),
                rpc_call_progproc(&rpcmsg), trans->name);
@@ -583,13 +575,9 @@ rpcsvc_request_create(rpcsvc_t *svc, rpc_transport_t *trans,
          */
         rpcsvc_request_seterr(req, AUTH_ERROR);
         gf_log(GF_RPCSVC, GF_LOG_ERROR,
-               "auth failed on request. "
-               "(XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
-               ", Program: %" GF_PRI_RPC_PROG_ID
-               ", "
-               "ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
-               ") "
-               "from trans (%s)",
+               "auth failed on request. (XID: 0x%" GF_PRI_RPC_XID ", Ver: %" GF_PRI_RPC_VERSION
+               ", Program: %" GF_PRI_RPC_PROG_ID ", ProgVers: %" GF_PRI_RPC_PROG_VERS ", Proc: %" GF_PRI_RPC_PROC
+               ") from trans (%s)",
                rpc_call_xid(&rpcmsg), rpc_call_rpcvers(&rpcmsg),
                rpc_call_program(&rpcmsg), rpc_call_progver(&rpcmsg),
                rpc_call_progproc(&rpcmsg), trans->name);
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
@@ -1345,7 +1345,7 @@ socket_event_poll_err(rpc_transport_t *this, int gen, int idx)
 
     pthread_mutex_lock(&priv->out_lock);
     {
-        if (IS_SUCCESS((priv->gen == gen) && (priv->idx == idx) && (priv->sock))) {
+        if ((priv->gen == gen) && (priv->idx == idx) && IS_SUCCESS(priv->sock)) {
             __socket_ioq_flush(priv);
             __socket_reset(this);
             socket_closed = _gf_true;
@@ -2535,7 +2535,7 @@ socket_event_poll_in(rpc_transport_t *this, gf_boolean_t notify_handled)
         pthread_mutex_unlock(&priv->notify.lock);
     }
 
-    if (IS_SUCCESS(notify_handled && (ret)))
+    if (notify_handled && IS_SUCCESS(ret))
         gf_event_handled(ctx->event_pool, priv->sock, priv->idx, priv->gen);
 
     if (pollin) {
@@ -2951,7 +2951,7 @@ socket_event_handler(int fd, int idx, int gen, void *data, int poll_in,
                          this->name, "disconnecting from");
 
         /* Logging has happened already in earlier cases */
-        gf_log(IS_SUCCESS("transport", ((ret)) ? GF_LOG_INFO : GF_LOG_DEBUG),
+        gf_log("transport", (IS_SUCCESS(ret) ? GF_LOG_INFO : GF_LOG_DEBUG),
                "EPOLLERR - disconnecting (sock:%d) (%s)", priv->sock,
                (priv->use_ssl ? "SSL" : "non-SSL"));
 
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
@@ -5785,7 +5785,7 @@ find_best_down_child(xlator_t *this)
     priv = this->private;
 
     for (i = 0; i < priv->child_count; i++) {
-        if (IS_SUCCESS(!priv->child_up[i] && priv->child_latency[i]) &&
+        if (!priv->child_up[i] && IS_SUCCESS(priv->child_latency[i]) &&
             priv->child_latency[i] < best_latency) {
             best_child = i;
             best_latency = priv->child_latency[i];
@@ -5810,7 +5810,7 @@ find_worst_up_child(xlator_t *this)
     priv = this->private;
 
     for (i = 0; i < priv->child_count; i++) {
-        if (IS_SUCCESS(priv->child_up[i] && priv->child_latency[i]) &&
+        if (priv->child_up[i] && IS_SUCCESS(priv->child_latency[i]) &&
             priv->child_latency[i] > worst_latency) {
             worst_child = i;
             worst_latency = priv->child_latency[i];
diff --git a/xlators/cluster/afr/src/afr-read-txn.c b/xlators/cluster/afr/src/afr-read-txn.c
@@ -304,7 +304,7 @@ afr_read_txn_refresh_done(call_frame_t *frame, xlator_t *this, int err)
 readfn:
     if (IS_ERROR(read_subvol)) {
         ret = afr_inode_split_brain_choice_get(inode, this, &spb_choice);
-        if (IS_SUCCESS((ret == 0) && spb_choice))
+        if ((ret == 0) && IS_SUCCESS(spb_choice))
             read_subvol = spb_choice;
     }
 
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -1229,25 +1229,25 @@ afr_sh_get_fav_by_policy(xlator_t *this, struct afr_reply *replies,
     switch (priv->fav_child_policy) {
         case AFR_FAV_CHILD_BY_SIZE:
             fav_child = afr_sh_fav_by_size(this, replies, inode);
-            if (IS_SUCCESS(policy_str && fav_child)) {
+            if (policy_str && IS_SUCCESS(fav_child)) {
                 *policy_str = "SIZE";
             }
             break;
         case AFR_FAV_CHILD_BY_CTIME:
             fav_child = afr_sh_fav_by_ctime(this, replies, inode);
-            if (IS_SUCCESS(policy_str && fav_child)) {
+            if (policy_str && IS_SUCCESS(fav_child)) {
                 *policy_str = "CTIME";
             }
             break;
         case AFR_FAV_CHILD_BY_MTIME:
             fav_child = afr_sh_fav_by_mtime(this, replies, inode);
-            if (IS_SUCCESS(policy_str && fav_child)) {
+            if (policy_str && IS_SUCCESS(fav_child)) {
                 *policy_str = "MTIME";
             }
             break;
         case AFR_FAV_CHILD_BY_MAJORITY:
             fav_child = afr_sh_fav_by_majority(this, replies, inode);
-            if (IS_SUCCESS(policy_str && fav_child)) {
+            if (policy_str && IS_SUCCESS(fav_child)) {
                 *policy_str = "MAJORITY";
             }
             break;
diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c
@@ -277,7 +277,7 @@ afr_selfheal_name_gfid_mismatch_check(xlator_t *this, struct afr_reply *replies,
                 ret = afr_gfid_split_brain_source(this, replies, inode, pargfid,
                                                   bname, gfid_idx_iter, i,
                                                   locked_on, gfid_idx, xdata);
-                if (IS_SUCCESS(!ret && *gfid_idx)) {
+                if (!ret && IS_SUCCESS(*gfid_idx)) {
                     ret = dict_set_sizen_str_sizen(xdata, "gfid-heal-msg",
                                                    "GFID split-brain resolved");
                     if (ret)
diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c
@@ -84,7 +84,7 @@ dht_set_fixed_dir_stat(struct iatt *stat)
 static gf_boolean_t
 dht_match_xattr(const char *key)
 {
-    return gf_get_index_by_elem(IS_SUCCESS(xattrs_to_heal, (char *)key));
+    return IS_SUCCESS(gf_get_index_by_elem(xattrs_to_heal, (char *)key));
 }
 
 static int
@@ -9104,7 +9104,7 @@ dht_mkdir_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret,
 
     LOCK(&frame->lock);
     {
-        if (IS_SUCCESS(subvol_filled && (op_ret))) {
+        if (subvol_filled && IS_SUCCESS(op_ret)) {
             ret = dht_layout_merge(this, layout, prev, -1, ENOSPC, NULL);
         } else {
             if (IS_ERROR(op_ret) && op_errno == EEXIST) {
diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c
@@ -895,7 +895,7 @@ dht_last_up_subvol(xlator_t *this)
 
     LOCK(&conf->subvolume_lock);
     {
-        for (IS_SUCCESS(i = conf->subvolume_cnt - 1; i); i--) {
+        for (i = conf->subvolume_cnt - 1; i >= 0; i--) {
             if (conf->subvolume_status[i]) {
                 child = conf->subvolumes[i];
                 break;
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c
@@ -1525,7 +1525,7 @@ dht_rename_lookup_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
         local->op_errno = ENOENT;
     }
 
-    if (IS_SUCCESS(!local->is_linkfile && (op_ret)) &&
+    if (!local->is_linkfile && IS_SUCCESS(op_ret) &&
         gf_uuid_compare(loc->gfid, stbuf->ia_gfid)) {
         gf_uuid_unparse(loc->gfid, gfid_local);
         gf_uuid_unparse(stbuf->ia_gfid, gfid_server);
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
@@ -307,7 +307,7 @@ ec_check_status(ec_fop_data_t *fop)
         return;
     }
 
-    if (IS_SUCCESS(fop->answer && fop->answer->op_ret)) {
+    if (fop->answer && IS_SUCCESS(fop->answer->op_ret)) {
         if ((fop->id == GF_FOP_LOOKUP) || (fop->id == GF_FOP_STAT) ||
             (fop->id == GF_FOP_FSTAT)) {
             partial = fop->answer->iatt[0].ia_type == IA_IFDIR;
@@ -393,7 +393,7 @@ ec_fop_set_error(ec_fop_data_t *fop, int32_t error)
 gf_boolean_t
 ec_cbk_set_error(ec_cbk_data_t *cbk, int32_t error, gf_boolean_t ro)
 {
-    if (IS_SUCCESS((error != 0) && (cbk->op_ret))) {
+    if ((error != 0) && IS_SUCCESS(cbk->op_ret)) {
         /* If cbk->op_errno was 0, it means that the fop succeeded and this
          * error has happened while processing the answer. If the operation was
          * read-only, there's no problem (i.e. we simply return the generated
@@ -2124,7 +2124,7 @@ ec_lock_next_owner(ec_lock_link_t *link, ec_cbk_data_t *cbk,
 
     lock->release |= release;
 
-    if (IS_SUCCESS((fop->error == 0) && (cbk != NULL) && (cbk->op_ret))) {
+    if ((fop->error == 0) && (cbk != NULL) && IS_SUCCESS(cbk->op_ret)) {
         if (link->update[0]) {
             ctx->post_version[0]++;
         }
diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
@@ -666,7 +666,7 @@ ec_heal_metadata_find_direction(ec_t *ec, default_args_cbk_t *replies,
     for (i = 0; i < ec->nodes; i++) {
         if (groups[i] == groups[same_source])
             sources[i] = 1;
-        else if (IS_SUCCESS(replies[i].valid && replies[i].op_ret))
+        else if (replies[i].valid && IS_SUCCESS(replies[i].op_ret))
             healed_sinks[i] = 1;
     }
     for (i = 0; i < ec->nodes; i++) {
diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c
@@ -163,7 +163,7 @@ ec_shd_selfheal(struct subvol_healer *healer, int child, loc_t *loc,
     int32_t ret;
 
     ret = syncop_getxattr(healer->this, loc, NULL, EC_XATTR_HEAL, NULL, NULL);
-    if (IS_SUCCESS(!full && (ret)) && (loc->inode->ia_type == IA_IFDIR)) {
+    if ((!full && IS_SUCCESS(ret)) && (loc->inode->ia_type == IA_IFDIR)) {
         /* If we have just healed a directory, it's possible that
          * other index entries have appeared to be healed. We put a
          * mark so that we can check it later and restart a scan
diff --git a/xlators/cluster/ec/src/ec-inode-read.c b/xlators/cluster/ec/src/ec-inode-read.c
@@ -1020,7 +1020,7 @@ ec_manager_readlink(ec_fop_data_t *fop, int32_t state)
                 return EC_STATE_DISPATCH;
             }
 
-            if (IS_SUCCESS((cbk != NULL) && (cbk->op_ret))) {
+            if ((cbk != NULL) && IS_SUCCESS(cbk->op_ret)) {
                 ec_iatt_rebuild(fop->xl->private, &cbk->iatt[0], 1, 1);
             }
 
@@ -1574,7 +1574,7 @@ ec_manager_seek(ec_fop_data_t *fop, int32_t state)
             if (ec_dispatch_one_retry(fop, &cbk)) {
                 return EC_STATE_DISPATCH;
             }
-            if (IS_SUCCESS((cbk != NULL) && (cbk->op_ret))) {
+            if ((cbk != NULL) && IS_SUCCESS(cbk->op_ret)) {
                 ec_t *ec = fop->xl->private;
 
                 /* This shouldn't fail because we have the inode locked. */
diff --git a/xlators/features/bit-rot/src/bitd/bit-rot.c b/xlators/features/bit-rot/src/bitd/bit-rot.c
@@ -1775,7 +1775,7 @@ br_init_signer(xlator_t *this, br_private_t *priv)
     return 0;
 
 cleanup_threads:
-    for (IS_SUCCESS(i--; i); i--) {
+    for (i--; i >= 0; i--) {
         (void)gf_thread_cleanup_xint(priv->obj_queue->workers[i]);
     }
     GF_FREE(priv->obj_queue->workers);
@@ -1928,7 +1928,7 @@ br_free_children(xlator_t *this, br_private_t *priv, int count)
 {
     br_child_t *child = NULL;
 
-    for (IS_SUCCESS(--count; count); count--) {
+    for (--count; count >= 0; count--) {
         child = &priv->children[count];
         mem_pool_destroy(child->timer_pool);
         pthread_mutex_destroy(&child->lock);
diff --git a/xlators/features/changelog/src/changelog-rpc.c b/xlators/features/changelog/src/changelog-rpc.c
@@ -18,7 +18,7 @@ static struct rpcsvc_program *changelog_programs[];
 static void
 changelog_cleanup_dispatchers(xlator_t *this, changelog_priv_t *priv, int count)
 {
-    for (IS_SUCCESS(count--; count); count--) {
+    for (count--; count >= 0; count--) {
         (void)changelog_thread_cleanup(this, priv->ev_dispatcher[count]);
         priv->ev_dispatcher[count] = 0;
     }
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
@@ -1706,7 +1706,7 @@ pl_fsetxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     pl_inode_t *pl_inode = NULL;
 
     local = frame->local;
-    if (IS_SUCCESS(local && local->update_mlock_enforced_flag && op_ret)) {
+    if (local && local->update_mlock_enforced_flag && IS_SUCCESS(op_ret)) {
         pl_inode = pl_inode_get(this, local->inode, NULL);
         if (!pl_inode) {
             op_ret = -1;
@@ -3428,7 +3428,7 @@ pl_setxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     pl_local_t *local = NULL;
     pl_inode_t *pl_inode = NULL;
     local = frame->local;
-    if (IS_SUCCESS(local && local->update_mlock_enforced_flag && op_ret)) {
+    if (local && local->update_mlock_enforced_flag && IS_SUCCESS(op_ret)) {
         pl_inode = pl_inode_get(this, local->inode, NULL);
         if (!pl_inode) {
             op_ret = -1;
@@ -4492,7 +4492,7 @@ pl_removexattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     pl_inode_t *pl_inode = NULL;
 
     local = frame->local;
-    if (IS_SUCCESS(local && local->update_mlock_enforced_flag && op_ret)) {
+    if (local && local->update_mlock_enforced_flag && IS_SUCCESS(op_ret)) {
         pl_inode = pl_inode_get(this, local->inode, NULL);
         if (!pl_inode) {
             op_ret = -1;
@@ -4547,7 +4547,7 @@ pl_fremovexattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this,
     pl_inode_t *pl_inode = NULL;
 
     local = frame->local;
-    if (IS_SUCCESS(local && local->update_mlock_enforced_flag && op_ret)) {
+    if (local && local->update_mlock_enforced_flag && IS_SUCCESS(op_ret)) {
         pl_inode = pl_inode_get(this, local->inode, NULL);
         if (!pl_inode) {
             op_ret = -1;
diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c
@@ -1123,8 +1123,8 @@ quota_check_object_limit(call_frame_t *frame, quota_inode_ctx_t *ctx,
             timeout = priv->soft_timeout;
 
             object_aggr_count = ctx->file_count + ctx->dir_count + 1;
-            if (IS_SUCCESS(((ctx->object_soft_lim)) &&
-                 (object_aggr_count) > ctx->object_soft_lim)) {
+            if (IS_SUCCESS(ctx->object_soft_lim) &&
+		(object_aggr_count > ctx->object_soft_lim)) {
                 timeout = priv->hard_timeout;
             }
 
@@ -1191,7 +1191,7 @@ quota_check_size_limit(call_frame_t *frame, quota_inode_ctx_t *ctx,
         {
             timeout = priv->soft_timeout;
 
-            if (IS_SUCCESS((ctx->soft_lim)) && (wouldbe_size > ctx->soft_lim)) {
+            if (IS_SUCCESS(ctx->soft_lim) && (wouldbe_size > ctx->soft_lim)) {
                 timeout = priv->hard_timeout;
             }
 
diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c
@@ -103,7 +103,7 @@ meta_default_writev(call_frame_t *frame, xlator_t *this, fd_t *fd,
 
     ret = ops->file_write(this, fd, vector, count);
 
-    META_STACK_UNWIND(IS_SUCCESS(writev, frame, (ret) ? ret : -1),
+    META_STACK_UNWIND(writev, frame, (IS_SUCCESS(ret) ? ret : -1),
                       (IS_ERROR(ret) ? -ret : 0), &dummy, &dummy, xdata);
     return 0;
 err:
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c
@@ -1913,7 +1913,7 @@ glusterd_store_global_info(xlator_t *this)
     ret = gf_store_rename_tmppath(handle);
 out:
     if (handle) {
-        if (IS_SUCCESS(ret && (handle->fd)))
+        if (ret && IS_SUCCESS(handle->fd))
             gf_store_unlink_tmppath(handle);
     }
 
@@ -1982,7 +1982,7 @@ glusterd_store_max_op_version(xlator_t *this)
     ret = gf_store_rename_tmppath(handle);
 out:
     if (handle) {
-        if (IS_SUCCESS(ret && (handle->fd)))
+        if (ret && IS_SUCCESS(handle->fd))
             gf_store_unlink_tmppath(handle);
     }
 
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c
diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c
diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c
diff --git a/xlators/protocol/client/src/client-rpc-fops_v2.c b/xlators/protocol/client/src/client-rpc-fops_v2.c
diff --git a/xlators/protocol/server/src/server-common.c b/xlators/protocol/server/src/server-common.c
diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c
diff --git a/xlators/protocol/server/src/server-rpc-fops_v2.c b/xlators/protocol/server/src/server-rpc-fops_v2.c
diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c
diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ afr_read_txn_refresh_done(call_frame_t frame, xlator_t this, int err)`
`304`	`304`	`readfn:`
`305`	`305`	`if (IS_ERROR(read_subvol)) {`
`306`	`306`	`ret = afr_inode_split_brain_choice_get(inode, this, &spb_choice);`
`307`		`- if (IS_SUCCESS((ret == 0) && spb_choice))`
	`307`	`+ if ((ret == 0) && IS_SUCCESS(spb_choice))`
`308`	`308`	`read_subvol = spb_choice;`
`309`	`309`	`}`
`310`	`310`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ dht_set_fixed_dir_stat(struct iatt *stat)`
`84`	`84`	`static gf_boolean_t`
`85`	`85`	`dht_match_xattr(const char *key)`
`86`	`86`	`{`
`87`		`- return gf_get_index_by_elem(IS_SUCCESS(xattrs_to_heal, (char *)key));`
	`87`	`+ return IS_SUCCESS(gf_get_index_by_elem(xattrs_to_heal, (char *)key));`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`static int`
`@@ -9104,7 +9104,7 @@ dht_mkdir_cbk(call_frame_t frame, void cookie, xlator_t *this, int op_ret,`
`9104`	`9104`
`9105`	`9105`	`LOCK(&frame->lock);`
`9106`	`9106`	`{`
`9107`		`- if (IS_SUCCESS(subvol_filled && (op_ret))) {`
	`9107`	`+ if (subvol_filled && IS_SUCCESS(op_ret)) {`
`9108`	`9108`	`ret = dht_layout_merge(this, layout, prev, -1, ENOSPC, NULL);`
`9109`	`9109`	`} else {`
`9110`	`9110`	`if (IS_ERROR(op_ret) && op_errno == EEXIST) {`