From 9be043159a514db68b336c6aea49613f3125c5e0 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 2 Mar 2018 10:13:20 +0530 Subject: cluster/afr: Remove compound-fops usage in afr We are not seeing much improvement with this change. So removing the feature so that it doesn't need to be maintained anymore. Fixes: #414 Change-Id: Ic7969b151544daf2547bd262a9fa03f575626411 Signed-off-by: Pranith Kumar K --- xlators/cluster/afr/src/afr-common.c | 43 ------------------------------------ 1 file changed, 43 deletions(-) (limited to 'xlators/cluster/afr/src/afr-common.c') diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 0052968e0e4..d8fee88c7df 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -40,7 +40,6 @@ #include "afr-self-heal.h" #include "afr-self-heald.h" #include "afr-messages.h" -#include "compound-fop-utils.h" int32_t afr_quorum_errno (afr_private_t *priv) @@ -5318,7 +5317,6 @@ afr_local_init (afr_local_t *local, afr_private_t *priv, int32_t *op_errno) local->need_full_crawl = _gf_false; - local->compound = _gf_false; INIT_LIST_HEAD (&local->healer); return 0; out: @@ -5465,7 +5463,6 @@ afr_transaction_local_init (afr_local_t *local, xlator_t *this) if (!local->pending) goto out; - local->compound = _gf_false; INIT_LIST_HEAD (&local->transaction.eager_locked); ret = 0; @@ -6220,46 +6217,6 @@ afr_get_msg_id (char *op_type) return -1; } -gf_boolean_t -afr_can_compound_pre_op_and_op (afr_private_t *priv, glusterfs_fop_t fop) -{ - if (priv->arbiter_count != 0) - return _gf_false; - - if (!priv->use_compound_fops) - return _gf_false; - - switch (fop) { - case GF_FOP_WRITE: - return _gf_true; - default: - return _gf_false; - } -} - -afr_compound_cbk_t -afr_pack_fop_args (call_frame_t *frame, compound_args_t *args, - glusterfs_fop_t fop, int index) -{ - afr_local_t *local = frame->local; - - switch (fop) { - case GF_FOP_WRITE: - COMPOUND_PACK_ARGS (writev, GF_FOP_WRITE, - args, index, - local->fd, local->cont.writev.vector, - local->cont.writev.count, - local->cont.writev.offset, - local->cont.writev.flags, - local->cont.writev.iobref, - local->xdata_req); - return afr_pre_op_writev_cbk; - default: - break; - } - return NULL; -} - int afr_fav_child_reset_sink_xattrs_cbk (int ret, call_frame_t *heal_frame, void *opaque) -- cgit