summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/hacker-guide/write-behind.txt4
-rw-r--r--libglusterfs/src/stack.h2
-rw-r--r--rpc/rpc-lib/src/rpc-clnt.c4
-rw-r--r--rpc/rpc-lib/src/rpc-transport.h2
-rw-r--r--rpc/rpc-lib/src/rpcsvc.c2
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.c6
-rw-r--r--rpc/rpc-transport/socket/src/socket.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c2
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-op-sm.c50
-rw-r--r--xlators/nfs/server/src/nfs-fops.c2
-rw-r--r--xlators/performance/quick-read/src/quick-read.c2
11 files changed, 39 insertions, 39 deletions
diff --git a/doc/hacker-guide/write-behind.txt b/doc/hacker-guide/write-behind.txt
index 498e95480..a6e9a8890 100644
--- a/doc/hacker-guide/write-behind.txt
+++ b/doc/hacker-guide/write-behind.txt
@@ -9,7 +9,7 @@ basic working
2. VFS ==> FUSE ==> /dev/fuse.
3. fuse-bridge initiates a glusterfs writev() call.
4. writev() is STACK_WIND()ed upto client-protocol or storage translator.
- 5. client-protocol, on recieving reply from server, starts STACK_UNWIND() towards the fuse-bridge.
+ 5. client-protocol, on receiving reply from server, starts STACK_UNWIND() towards the fuse-bridge.
on a translator tree with write-behind, control flow is like this:
@@ -30,7 +30,7 @@ windowing
write_behind: if set, indicates that write-behind has done STACK_UNWIND() towards fuse-bridge.
- got_reply: if set, indicates that write-behind has recieved reply from child translator for a writev() STACK_WIND(). a request will be destroyed by write-behind only if this flag is set.
+ got_reply: if set, indicates that write-behind has received reply from child translator for a writev() STACK_WIND(). a request will be destroyed by write-behind only if this flag is set.
currently pending write requests = aggregate size of requests with write_behind = 1 and got_reply = 0.
diff --git a/libglusterfs/src/stack.h b/libglusterfs/src/stack.h
index 7165facca..63b14ca46 100644
--- a/libglusterfs/src/stack.h
+++ b/libglusterfs/src/stack.h
@@ -71,7 +71,7 @@ struct _call_frame_t {
call_stack_t *root; /* stack root */
call_frame_t *parent; /* previous BP */
call_frame_t *next;
- call_frame_t *prev; /* maintainence list */
+ call_frame_t *prev; /* maintenance list */
void *local; /* local variables */
xlator_t *this; /* implicit object */
ret_fn_t ret; /* op_return address */
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
index 7e8a67a81..f85249b15 100644
--- a/rpc/rpc-lib/src/rpc-clnt.c
+++ b/rpc/rpc-lib/src/rpc-clnt.c
@@ -625,7 +625,7 @@ rpc_clnt_reply_init (rpc_clnt_connection_t *conn, rpc_transport_pollin_t *msg,
goto out;
}
- gf_log (conn->trans->name, GF_LOG_TRACE, "recieved rpc message (RPC XID: 0x%ux"
+ gf_log (conn->trans->name, GF_LOG_TRACE, "received rpc message (RPC XID: 0x%ux"
" Program: %s, ProgVers: %d, Proc: %d) from rpc-transport (%s)",
saved_frame->rpcreq->xid,
saved_frame->rpcreq->prog->progname,
@@ -666,7 +666,7 @@ rpc_clnt_handle_cbk (struct rpc_clnt *clnt, rpc_transport_pollin_t *msg)
}
gf_log (clnt->conn.trans->name, GF_LOG_TRACE,
- "recieved rpc message (XID: 0x%lx, "
+ "received rpc message (XID: 0x%lx, "
"Ver: %ld, Program: %ld, ProgVers: %ld, Proc: %ld) "
"from rpc-transport (%s)", rpc_call_xid (&rpcmsg),
rpc_call_rpcvers (&rpcmsg), rpc_call_program (&rpcmsg),
diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h
index a955df111..b42df31ea 100644
--- a/rpc/rpc-lib/src/rpc-transport.h
+++ b/rpc/rpc-lib/src/rpc-transport.h
@@ -97,7 +97,7 @@ typedef enum {
* reading a single msg, this event may be
* delivered more than once.
*/
- RPC_TRANSPORT_MAP_XID_REQUEST, /* reciever of this event should send
+ RPC_TRANSPORT_MAP_XID_REQUEST, /* receiver of this event should send
* the prognum and procnum corresponding
* to xid.
*/
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index cd8629de4..9d0d3d7a1 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -348,7 +348,7 @@ rpcsvc_request_create (rpcsvc_t *svc, rpc_transport_t *trans,
ret = -1;
rpcsvc_request_init (svc, trans, &rpcmsg, progmsg, msg, req);
- gf_log (GF_RPCSVC, GF_LOG_TRACE, "recieved rpc-message (XID: 0x%lx, "
+ gf_log (GF_RPCSVC, GF_LOG_TRACE, "received rpc-message (XID: 0x%lx, "
"Ver: %ld, Program: %ld, ProgVers: %ld, Proc: %ld) from"
" rpc-transport (%s)", rpc_call_xid (&rpcmsg),
rpc_call_rpcvers (&rpcmsg), rpc_call_program (&rpcmsg),
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 177730f65..7d2bfc0ad 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -2866,14 +2866,14 @@ rdma_decode_header (rdma_peer_t *peer, rdma_post_t *post,
case RDMA_MSGP:
gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
"rdma msg of msg-type RDMA_MSGP should not have been "
- "recieved");
+ "received");
ret = -1;
break;
case RDMA_DONE:
gf_log (RDMA_LOG_NAME, GF_LOG_ERROR,
"rdma msg of msg-type RDMA_DONE should not have been "
- "recieved");
+ "received");
ret = -1;
break;
@@ -3042,7 +3042,7 @@ rdma_pollin_notify (rdma_peer_t *peer, rdma_post_t *post)
}
/* handling the case where both hdr and payload of
- * GF_FOP_READ_CBK were recieved in a single iobuf
+ * GF_FOP_READ_CBK were received in a single iobuf
* because of server sending entire msg as inline without
* doing rdma writes.
*/
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 87430d22a..395bf7384 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -1382,7 +1382,7 @@ __socket_read_frag (rpc_transport_t *this)
} else if (priv->incoming.msg_type == GF_UNIVERSAL_ANSWER) {
gf_log ("rpc", GF_LOG_ERROR,
"older version of protocol/process trying to "
- "connect from %s. use newer verison on that node",
+ "connect from %s. use newer version on that node",
this->peerinfo.identifier);
} else {
gf_log ("rpc", GF_LOG_ERROR,
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index e4334af4d..aa37d93f0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1560,7 +1560,7 @@ glusterd_handle_replace_brick (rpcsvc_request_t *req)
break;
}
- gf_log ("glusterd", GF_LOG_NORMAL, "Recieved replace brick %s request", operation);
+ gf_log ("glusterd", GF_LOG_NORMAL, "Received replace brick %s request", operation);
gf_cmd_log ("Volume replace-brick","volname: %s src_brick:%s"
" dst_brick:%s op:%s",cli_req.volname, src_brick, dst_brick
,operation);
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index 6a4ffea2a..96a92f0f7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -66,7 +66,7 @@ static char *glusterd_op_sm_state_names[] = {
"Stage op sent",
"Staged",
"Commit op sent",
- "Commited",
+ "Committed",
"Unlock sent",
"Stage op failed",
"Commit op failed",
@@ -2714,7 +2714,7 @@ out:
}
static int
-rb_destroy_maintainence_client (glusterd_volinfo_t *volinfo,
+rb_destroy_maintenance_client (glusterd_volinfo_t *volinfo,
glusterd_brickinfo_t *src_brickinfo)
{
glusterd_conf_t *priv = NULL;
@@ -2733,7 +2733,7 @@ rb_destroy_maintainence_client (glusterd_volinfo_t *volinfo,
ret = stat (mount_point_path, &buf);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "stat failed. Cannot destroy maintainence "
+ "stat failed. Cannot destroy maintenance "
"client");
goto out;
}
@@ -2745,7 +2745,7 @@ rb_destroy_maintainence_client (glusterd_volinfo_t *volinfo,
ret = gf_system (cmd_str);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "umount failed on maintainence client");
+ "umount failed on maintenance client");
goto out;
}
@@ -2774,8 +2774,8 @@ out:
}
static int
-rb_spawn_maintainence_client (glusterd_volinfo_t *volinfo,
- glusterd_brickinfo_t *src_brickinfo)
+rb_spawn_maintenance_client (glusterd_volinfo_t *volinfo,
+ glusterd_brickinfo_t *src_brickinfo)
{
int ret = -1;
@@ -2841,10 +2841,10 @@ rb_do_operation_start (glusterd_volinfo_t *volinfo,
gf_log ("", GF_LOG_DEBUG,
"replace-brick sending start xattr");
- ret = rb_spawn_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_spawn_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Could not spawn maintainence "
+ "Could not spawn maintenance "
"client");
goto out;
}
@@ -2866,10 +2866,10 @@ rb_do_operation_start (glusterd_volinfo_t *volinfo,
"Failed to send command to pump");
}
- ret = rb_destroy_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_destroy_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Failed to destroy maintainence "
+ "Failed to destroy maintenance "
"client");
goto out;
}
@@ -2892,10 +2892,10 @@ rb_do_operation_pause (glusterd_volinfo_t *volinfo,
gf_log ("", GF_LOG_NORMAL,
"replace-brick send pause xattr");
- ret = rb_spawn_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_spawn_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Could not spawn maintainence "
+ "Could not spawn maintenance "
"client");
goto out;
}
@@ -2912,10 +2912,10 @@ rb_do_operation_pause (glusterd_volinfo_t *volinfo,
}
- ret = rb_destroy_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_destroy_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Failed to destroy maintainence "
+ "Failed to destroy maintenance "
"client");
goto out;
}
@@ -2964,10 +2964,10 @@ rb_do_operation_abort (glusterd_volinfo_t *volinfo,
gf_log ("", GF_LOG_DEBUG,
"replace-brick sending abort xattr");
- ret = rb_spawn_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_spawn_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Could not spawn maintainence "
+ "Could not spawn maintenance "
"client");
goto out;
}
@@ -2983,10 +2983,10 @@ rb_do_operation_abort (glusterd_volinfo_t *volinfo,
"Failed to send command to pump");
}
- ret = rb_destroy_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_destroy_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Failed to destroy maintainence "
+ "Failed to destroy maintenance "
"client");
goto out;
}
@@ -3072,10 +3072,10 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo,
origin = _gf_true;
if (origin) {
- ret = rb_spawn_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_spawn_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Could not spawn maintainence "
+ "Could not spawn maintenance "
"client");
goto out;
}
@@ -3111,10 +3111,10 @@ rb_do_operation_status (glusterd_volinfo_t *volinfo,
}
umount:
- ret = rb_destroy_maintainence_client (volinfo, src_brickinfo);
+ ret = rb_destroy_maintenance_client (volinfo, src_brickinfo);
if (ret) {
gf_log ("", GF_LOG_DEBUG,
- "Failed to destroy maintainence "
+ "Failed to destroy maintenance "
"client");
goto out;
}
@@ -3442,7 +3442,7 @@ glusterd_op_replace_brick (dict_t *dict, dict_t *rsp_dict)
case GF_REPLACE_OP_PAUSE:
{
gf_log ("", GF_LOG_DEBUG,
- "Recieved pause - doing nothing");
+ "Received pause - doing nothing");
ctx = glusterd_op_get_ctx (GD_OP_REPLACE_BRICK);
if (ctx) {
ret = rb_do_operation_pause (volinfo, src_brickinfo,
@@ -7373,7 +7373,7 @@ glusterd_op_sm_t glusterd_op_state_commit_op_sent [] = {
{GD_OP_STATE_COMMIT_OP_SENT, glusterd_op_ac_none}, //EVENT_MAX
};
-glusterd_op_sm_t glusterd_op_state_commited [] = {
+glusterd_op_sm_t glusterd_op_state_committed [] = {
{GD_OP_STATE_COMMITED, glusterd_op_ac_none}, //EVENT_NONE
{GD_OP_STATE_COMMITED, glusterd_op_ac_none},//EVENT_START_LOCK
{GD_OP_STATE_COMMITED, glusterd_op_ac_none}, //EVENT_LOCK
@@ -7415,7 +7415,7 @@ glusterd_op_sm_t *glusterd_op_state_table [] = {
glusterd_op_state_stage_op_sent,
glusterd_op_state_staged,
glusterd_op_state_commit_op_sent,
- glusterd_op_state_commited,
+ glusterd_op_state_committed,
glusterd_op_state_unlock_sent,
glusterd_op_state_stage_op_failed,
glusterd_op_state_commit_op_failed,
diff --git a/xlators/nfs/server/src/nfs-fops.c b/xlators/nfs/server/src/nfs-fops.c
index 068d08cf3..ff055aa51 100644
--- a/xlators/nfs/server/src/nfs-fops.c
+++ b/xlators/nfs/server/src/nfs-fops.c
@@ -293,7 +293,7 @@ out:
*
* nfs_<fopname>
* Unlike the nfs_fop_<fopname> variety, this is the stateful type of fop, in
- * that it silently performs all the relevant GlusterFS state maintainence
+ * that it silently performs all the relevant GlusterFS state maintenance
* operations on the data returned to the callbacks, leaving the caller's
* callback to just use the data returned for whatever it needs to do with that
* data, for eg. the nfs_lookup, will take care of looking up the inodes,
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c
index ee8730e76..044b00fd5 100644
--- a/xlators/performance/quick-read/src/quick-read.c
+++ b/xlators/performance/quick-read/src/quick-read.c
@@ -731,7 +731,7 @@ qr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
op_ret = -1;
op_errno = ENOTDIR;
gf_log (this->name, GF_LOG_WARNING,
- "open with O_DIRECTORY flag recieved on non-directory");
+ "open with O_DIRECTORY flag received on non-directory");
goto unwind;
}
generated by cgit (git 2.34.1) at 2024-11-14 13:24:18 +0000