diff options
Diffstat (limited to 'xlators/cluster/afr')
-rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 14 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-inode-read.c | 2 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.c | 2 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-lk-common.c | 4 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr.c | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index e2821f1b295..e60d5315dbe 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -912,7 +912,7 @@ afr_set_split_brain_choice (int ret, call_frame_t *frame, void *opaque) /* If timer cancel failed here it means that the * previous cbk will be executed which will set * spb_choice to -1. So we can consider the - * 'valid to -1' case to be a sucess + * 'valid to -1' case to be a success * (i.e. ret = 0) and goto unlock. */ goto unlock; @@ -4722,7 +4722,7 @@ afr_ipc_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int child_index = (long)cookie; int call_count = 0; gf_boolean_t failed = _gf_false; - gf_boolean_t succeded = _gf_false; + gf_boolean_t succeeded = _gf_false; int i = 0; afr_private_t *priv = NULL; @@ -4742,7 +4742,7 @@ afr_ipc_cbk (call_frame_t *frame, void *cookie, xlator_t *this, * return error else return success unless all the subvolumes * failed. * TODO: In case of failure, we need to unregister the xattrs - * from the other subvolumes where it succeded (once upcall + * from the other subvolumes where it succeeded (once upcall * fixes the Bz-1371622)*/ for (i = 0; i < priv->child_count; i++) { if (!local->replies[i].valid) @@ -4762,7 +4762,7 @@ afr_ipc_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; } if (local->replies[i].op_ret == 0) { - succeded = _gf_true; + succeeded = _gf_true; local->op_ret = 0; local->op_errno = 0; if (!local->xdata_rsp && local->replies[i].xdata) { @@ -4772,7 +4772,7 @@ afr_ipc_cbk (call_frame_t *frame, void *cookie, xlator_t *this, } } - if (!succeded && !failed) { + if (!succeeded && !failed) { local->op_ret = -1; local->op_errno = ENOTCONN; } @@ -5314,7 +5314,7 @@ __afr_handle_child_down_event (xlator_t *this, xlator_t *child_xlator, if (down_children == priv->child_count) { gf_msg (this->name, GF_LOG_ERROR, 0, AFR_MSG_SUBVOLS_DOWN, "All subvolumes are down. Going " - "offline until atleast one of them " + "offline until at least one of them " "comes back up."); gf_event (EVENT_AFR_SUBVOLS_DOWN, "subvol=%s", this->name); } else { @@ -5364,7 +5364,7 @@ afr_notify (xlator_t *this, int32_t event, priv->did_discovery = _gf_false; - /* parent xlators dont need to know about every child_up, child_down + /* parent xlators don't need to know about every child_up, child_down * because of afr ha. If all subvolumes go down, child_down has * to be triggered. In that state when 1 subvolume comes up child_up * needs to be triggered. dht optimizes revalidate lookup by sending diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 8d3c823043f..e8192a2b753 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -735,7 +735,7 @@ afr_getxattr_node_uuid_cbk (call_frame_t *frame, void *cookie, /** * _current_ becomes _next_ - * If done with all childs and yet no success; give up ! + * If done with all children and yet no success; give up ! */ curr_call_child = (int) ((long)cookie); if (++curr_call_child == priv->child_count) diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index 9a9ef2e90a5..755e928ef62 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -102,7 +102,7 @@ __afr_inode_write_finalize (call_frame_t *frame, xlator_t *this) below is important. - Highest precedence: largest op_ret - - Next precendence: if all op_rets are equal, read subvol + - Next precedence: if all op_rets are equal, read subvol - Least precedence: any succeeded subvol */ if ((local->op_ret < local->replies[i].op_ret) || diff --git a/xlators/cluster/afr/src/afr-lk-common.c b/xlators/cluster/afr/src/afr-lk-common.c index dff6644eb96..d7ff2b01a06 100644 --- a/xlators/cluster/afr/src/afr-lk-common.c +++ b/xlators/cluster/afr/src/afr-lk-common.c @@ -601,7 +601,7 @@ is_blocking_locks_count_sufficient (call_frame_t *frame, xlator_t *this) "gfid:%s.", uuid_utoa (local->inode->gfid)); return _gf_false; } else { - /*inodelk succeded on atleast one child. */ + /*inodelk succeeded on at least one child. */ return _gf_true; } @@ -611,7 +611,7 @@ is_blocking_locks_count_sufficient (call_frame_t *frame, xlator_t *this) return _gf_false; } /* For FOPS that take multiple sets of locks (mkdir, rename), - * there must be atleast one brick on which the locks from + * there must be at least one brick on which the locks from * all lock sets were successful. */ for (child = 0; child < priv->child_count; child++) { ret = _gf_true; diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 0d6773c96e8..0e86e33d03b 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -309,7 +309,7 @@ afr_pending_xattrs_init (afr_private_t *priv, xlator_t *this) child_count = priv->child_count; if (priv->thin_arbiter_count) { /* priv->pending_key[THIN_ARBITER_BRICK_INDEX] is used as the - * name of the thin arbiter file for persistance across add/ + * name of the thin arbiter file for persistence across add/ * removal of DHT subvols.*/ child_count++; } @@ -621,7 +621,7 @@ fini (xlator_t *this) UNLOCK (&priv->lock); this->private = NULL; afr_priv_destroy (priv); - //if (this->itable);//I dont see any destroy func + //if (this->itable);//I don't see any destroy func return 0; } |