From 979e12f16b57cbb848fb9096d673dc58ed9b67a4 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 9 Jan 2012 19:48:44 +0530 Subject: cluster/afr: Remove dead code Change-Id: I239128c51b728fbb7814fd6a41020b76c88fbd93 Signed-off-by: Pranith Kumar K BUG: 772876 Reviewed-on: http://review.gluster.com/2623 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/afr-self-heal-common.c | 34 ------------------------ xlators/cluster/afr/src/afr-self-heal-common.h | 6 ----- xlators/cluster/afr/src/afr-self-heal-metadata.c | 15 ----------- 3 files changed, 55 deletions(-) diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 0558fafaae5..ad84f8541dd 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -81,21 +81,6 @@ afr_sh_mark_source_sinks (call_frame_t *frame, xlator_t *this) sh->active_sinks = active_sinks; } -/** - * sink_count - return number of sinks in sources array - */ - -int -afr_sh_sink_count (int sources[], int child_count) -{ - int i = 0; - int sinks = 0; - for (i = 0; i < child_count; i++) - if (!sources[i]) - sinks++; - return sinks; -} - int afr_sh_source_count (int sources[], int child_count) { @@ -892,25 +877,6 @@ afr_sh_has_entry_pending (dict_t *xattr, xlator_t *this) return 0; } - -/** - * is_matrix_zero - return true if pending matrix is all zeroes - */ - -int -afr_sh_is_matrix_zero (int32_t *pending_matrix[], int child_count) -{ - int i = 0; - int j = 0; - - for (i = 0; i < child_count; i++) - for (j = 0; j < child_count; j++) - if (pending_matrix[i][j]) - return 0; - return 1; -} - - int afr_sh_missing_entries_done (call_frame_t *frame, xlator_t *this) { diff --git a/xlators/cluster/afr/src/afr-self-heal-common.h b/xlators/cluster/afr/src/afr-self-heal-common.h index 42730a852e7..b7a736a7431 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.h +++ b/xlators/cluster/afr/src/afr-self-heal-common.h @@ -37,9 +37,6 @@ typedef enum { int afr_sh_select_source (int sources[], int child_count); -int -afr_sh_sink_count (int sources[], int child_count); - int afr_sh_source_count (int sources[], int child_count); @@ -67,9 +64,6 @@ afr_sh_delta_to_xattr (afr_private_t *priv, int32_t *delta_matrix[], dict_t *xattr[], int child_count, afr_transaction_type type); -int -afr_sh_is_matrix_zero (int32_t *pending_matrix[], int child_count); - void afr_self_heal_type_str_get (afr_self_heal_t *self_heal_p, char *str, size_t size); diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index 992e9d88c3f..148e858bd26 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -88,21 +88,6 @@ afr_sh_metadata_done (call_frame_t *frame, xlator_t *this) return 0; } - -int -afr_sh_metadata_unlck_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno) -{ - int call_count = 0; - - call_count = afr_frame_return (frame); - - if (call_count == 0) - afr_sh_metadata_done (frame, this); - - return 0; -} - int afr_sh_inode_unlock (call_frame_t *frame, xlator_t *this) { -- cgit