diff options
Diffstat (limited to 'xlators/cluster/afr/src')
-rw-r--r-- | xlators/cluster/afr/src/afr-lk-common.c | 2 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-open.c | 16 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 2 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-entry.c | 8 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 4 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-transaction.c | 3 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr.c | 2 | ||||
-rw-r--r-- | xlators/cluster/afr/src/pump.c | 12 |
8 files changed, 10 insertions, 39 deletions
diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index ba468dcdcb1..1828ddde789 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -588,7 +588,6 @@ afr_unlock_inodelk (call_frame_t *frame, xlator_t *this) afr_private_t *priv = NULL; struct gf_flock flock = {0,}; struct gf_flock full_flock = {0,}; - struct gf_flock *flock_use = &flock; int call_count = 0; int i = 0; int piggyback = 0; @@ -636,7 +635,6 @@ afr_unlock_inodelk (call_frame_t *frame, xlator_t *this) } piggyback = 0; - flock_use = &full_flock; LOCK (&local->fd->lock); { diff --git a/xlators/cluster/afr/src/afr-open.c b/xlators/cluster/afr/src/afr-open.c index 4b328e18450..4075c272408 100644 --- a/xlators/cluster/afr/src/afr-open.c +++ b/xlators/cluster/afr/src/afr-open.c @@ -92,14 +92,12 @@ afr_perform_data_self_heal (call_frame_t *frame, xlator_t *this) { afr_local_t *local = NULL; afr_self_heal_t *sh = NULL; - afr_private_t *priv = NULL; inode_t *inode = NULL; int st_child = -1; char reason[64] = {0}; local = frame->local; sh = &local->self_heal; - priv = this->private; inode = local->fd->inode; if (!IA_ISREG (inode->ia_type)) @@ -392,13 +390,13 @@ int afr_fix_open (call_frame_t *frame, xlator_t *this, afr_fd_ctx_t *fd_ctx, int need_open_count, int *need_open) { - afr_local_t *local = NULL; - afr_private_t *priv = NULL; - int i = 0; - call_frame_t *open_frame = NULL; - afr_local_t *open_local = NULL; - int ret = -1; - int32_t op_errno = 0; + afr_local_t *local = NULL; + afr_private_t *priv = NULL; + int i = 0; + call_frame_t *open_frame = NULL; + afr_local_t *open_local = NULL; + int ret = -1; + GF_UNUSED int32_t op_errno = 0; GF_ASSERT (fd_ctx); GF_ASSERT (need_open_count > 0); diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index d1456d936bf..6dd17c1b8be 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1087,7 +1087,6 @@ afr_impunge_frame_create (call_frame_t *frame, xlator_t *this, { afr_local_t *local = NULL; afr_local_t *impunge_local = NULL; - afr_self_heal_t *sh = NULL; afr_self_heal_t *impunge_sh = NULL; int32_t op_errno = 0; afr_private_t *priv = NULL; @@ -1104,7 +1103,6 @@ afr_impunge_frame_create (call_frame_t *frame, xlator_t *this, ALLOC_OR_GOTO (impunge_local, afr_local_t, out); local = frame->local; - sh = &local->self_heal; new_frame->local = impunge_local; impunge_sh = &impunge_local->self_heal; impunge_sh->sh_frame = frame; diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index af41c480e87..0481d915d25 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -897,9 +897,7 @@ afr_sh_entry_call_impunge_done (call_frame_t *impunge_frame, xlator_t *this, afr_self_heal_t *impunge_sh = NULL; call_frame_t *frame = NULL; int32_t impunge_ret_child = 0; - afr_private_t *priv = NULL; - priv = this->private; AFR_INIT_SH_FRAME_VALS (impunge_frame, impunge_local, impunge_sh, frame, local, sh); @@ -918,12 +916,10 @@ afr_sh_entry_impunge_setattr_cbk (call_frame_t *impunge_frame, void *cookie, int call_count = 0; afr_private_t *priv = NULL; afr_local_t *impunge_local = NULL; - afr_self_heal_t *impunge_sh = NULL; int child_index = 0; priv = this->private; impunge_local = impunge_frame->local; - impunge_sh = &impunge_local->self_heal; child_index = (long) cookie; if (op_ret == 0) { @@ -1247,11 +1243,9 @@ afr_sh_entry_impunge_symlink (call_frame_t *impunge_frame, xlator_t *this, dict_t *dict = NULL; struct iatt *buf = NULL; int ret = 0; - afr_self_heal_t *impunge_sh = NULL; priv = this->private; impunge_local = impunge_frame->local; - impunge_sh = &impunge_local->self_heal; buf = &impunge_local->cont.symlink.buf; @@ -1734,7 +1728,6 @@ int afr_sh_entry_impunge_entry (call_frame_t *frame, xlator_t *this, gf_dirent_t *entry) { - afr_private_t *priv = NULL; afr_local_t *local = NULL; afr_self_heal_t *sh = NULL; int ret = -1; @@ -1745,7 +1738,6 @@ afr_sh_entry_impunge_entry (call_frame_t *frame, xlator_t *this, int op_ret = -1; mode_t entry_mode = 0; - priv = this->private; local = frame->local; sh = &local->self_heal; diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index 30450d97c8f..dd0dd86da0c 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -115,11 +115,8 @@ _perform_self_heal (xlator_t *this, loc_t *parentloc, gf_dirent_t *entries, struct iatt parent = {0};; int ret = 0; loc_t entry_loc = {0}; - afr_private_t *priv = NULL; dict_t *xattr_req = NULL; - priv = this->private; - xattr_req = dict_new (); if (!xattr_req) { ret = -1; @@ -525,3 +522,4 @@ afr_set_root_gfid (dict_t *dict) return ret; } + diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c index 8ec634fd4bb..d3960dcff40 100644 --- a/xlators/cluster/afr/src/afr-transaction.c +++ b/xlators/cluster/afr/src/afr-transaction.c @@ -336,15 +336,12 @@ afr_changelog_post_op_cbk (call_frame_t *frame, void *cookie, xlator_t *this, afr_internal_lock_t *int_lock = NULL; afr_private_t *priv = NULL; afr_local_t *local = NULL; - int child_index = 0; int call_count = -1; priv = this->private; local = frame->local; int_lock = &local->internal_lock; - child_index = (long) cookie; - LOCK (&frame->lock); { call_count = --local->call_count; diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 8bb94e2053e..30da3fc729f 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -178,7 +178,7 @@ init (xlator_t *this) xlator_list_t * trav = NULL; int i = 0; int ret = -1; - int op_errno = 0; + GF_UNUSED int op_errno = 0; xlator_t * read_subvol = NULL; xlator_t * fav_child = NULL; diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index 63c89b3c7b2..dbf86b0a2a6 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -249,13 +249,11 @@ static int pump_update_resume_state (xlator_t *this, const char *path) { afr_private_t *priv = NULL; - pump_private_t *pump_priv = NULL; pump_state_t state; const char *resume_path = NULL; priv = this->private; - pump_priv = priv->pump_private; state = pump_get_state (); @@ -284,14 +282,10 @@ pump_update_resume_state (xlator_t *this, const char *path) static gf_boolean_t is_pump_traversal_allowed (xlator_t *this, const char *path) { - afr_private_t *priv = NULL; - pump_state_t state; const char *resume_path = NULL; gf_boolean_t ret = _gf_true; - priv = this->private; - state = pump_get_state (); if (state == PUMP_STATE_RESUME) { @@ -472,12 +466,8 @@ out: static int pump_update_resume_path (xlator_t *this) { - afr_private_t *priv = NULL; - const char *resume_path = NULL; - priv = this->private; - resume_path = pump_get_resume_path (this); if (resume_path) { @@ -2386,7 +2376,7 @@ init (xlator_t *this) xlator_list_t * trav = NULL; int i = 0; int ret = -1; - int op_errno = 0; + GF_UNUSED int op_errno = 0; int source_child = 0; |