summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
Diffstat (limited to 'rpc')
-rw-r--r--rpc/rpc-lib/src/rpc-transport.c4
-rw-r--r--rpc/rpc-lib/src/rpcsvc.c4
-rw-r--r--rpc/rpc-transport/rdma/src/name.c2
-rw-r--r--rpc/rpc-transport/rdma/src/rdma.c2
-rw-r--r--rpc/rpc-transport/socket/src/name.c2
-rw-r--r--rpc/rpc-transport/socket/src/socket.c10
-rw-r--r--rpc/xdr/src/glusterfs3.h3
7 files changed, 14 insertions, 13 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c
index 9497ecf78e5..946e65b879c 100644
--- a/rpc/rpc-lib/src/rpc-transport.c
+++ b/rpc/rpc-lib/src/rpc-transport.c
@@ -205,7 +205,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name)
"\"socket\"");
} else {
{
- /* Backword compatibility to handle * /client,
+ /* Backward compatibility to handle * /client,
* * /server.
*/
char *tmp = strchr (type, '/');
@@ -563,7 +563,7 @@ out:
//give negative values to skip setting that value
//this function asserts if both the values are negative.
-//why call it if you dont set it.
+//why call it if you don't set it.
int
rpc_transport_keepalive_options_set (dict_t *options, int32_t interval,
int32_t time, int32_t timeout)
diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c
index 01847e6c5ad..c8aaf4c7fa9 100644
--- a/rpc/rpc-lib/src/rpcsvc.c
+++ b/rpc/rpc-lib/src/rpcsvc.c
@@ -2859,7 +2859,7 @@ rpcsvc_transport_privport_check (rpcsvc_t *svc, char *volname, uint16_t port)
return ret;
gf_log (GF_RPCSVC, GF_LOG_TRACE, "Client port: %d", (int)port);
- /* If the port is already a privileged one, dont bother with checking
+ /* If the port is already a privileged one, don't bother with checking
* options.
*/
if (port <= 1024) {
@@ -2973,7 +2973,7 @@ rpcsvc_match_subnet_v4 (const char *addrtok, const char *ipaddr)
*slash = '\0';
/*
* Find the IPv4 network mask in network byte order.
- * IMP: String slash+1 is already validated, it cant have value
+ * IMP: String slash+1 is already validated, it can't have value
* more than IPv4_ADDR_SIZE (32).
*/
prefixlen = (uint32_t) atoi (slash + 1);
diff --git a/rpc/rpc-transport/rdma/src/name.c b/rpc/rpc-transport/rdma/src/name.c
index 121960aab26..f132b9638f8 100644
--- a/rpc/rpc-transport/rdma/src/name.c
+++ b/rpc/rpc-transport/rdma/src/name.c
@@ -91,7 +91,7 @@ loop:
port--;
}
- /* Incase if all the secure ports are exhausted, we are no more
+ /* In case if all the secure ports are exhausted, we are no more
* binding to secure ports, hence instead of getting a random
* port, lets define the range to restrict it from getting from
* ports reserved for bricks i.e from range of 49152 - 65535
diff --git a/rpc/rpc-transport/rdma/src/rdma.c b/rpc/rpc-transport/rdma/src/rdma.c
index 1595be2e049..f1859a73bdf 100644
--- a/rpc/rpc-transport/rdma/src/rdma.c
+++ b/rpc/rpc-transport/rdma/src/rdma.c
@@ -4052,7 +4052,7 @@ gf_rdma_process_recv (gf_rdma_peer_t *peer, struct ibv_wc *wc)
* have to account for the quota used while sending
* first msg (which may or may not be returned to pool
* at this point) while deriving peer.quota from
- * header->rm_credit. Hence the arithmatic below,
+ * header->rm_credit. Hence the arithmetic below,
* instead of directly setting it to header->rm_credit.
*/
priv->peer.quota = header->rm_credit
diff --git a/rpc/rpc-transport/socket/src/name.c b/rpc/rpc-transport/socket/src/name.c
index c64b46baa11..077736a2e52 100644
--- a/rpc/rpc-transport/socket/src/name.c
+++ b/rpc/rpc-transport/socket/src/name.c
@@ -79,7 +79,7 @@ loop:
port--;
}
- /* Incase if all the secure ports are exhausted, we are no more
+ /* In case if all the secure ports are exhausted, we are no more
* binding to secure ports, hence instead of getting a random
* port, lets define the range to restrict it from getting from
* ports reserved for bricks i.e from range of 49152 - 65535
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
index 3d0e22b88f9..3068b879802 100644
--- a/rpc/rpc-transport/socket/src/socket.c
+++ b/rpc/rpc-transport/socket/src/socket.c
@@ -3084,7 +3084,7 @@ socket_server_event_handler (int fd, int idx, int gen, void *data,
/* event_register() could have failed for some
* reason, implying that the new_sock cannot be
- * added to the epoll set. If we wont get any
+ * added to the epoll set. If we won't get any
* more notifications for new_sock from epoll,
* then we better remove the corresponding
* new_trans object from the RPCSVC service list.
@@ -3313,7 +3313,7 @@ socket_connect (rpc_transport_t *this, int port)
goto unlock;
}
- /* Cant help if setting socket options fails. We can continue
+ /* Can't help if setting socket options fails. We can continue
* working nonetheless.
*/
if (priv->windowsize != 0) {
@@ -3340,7 +3340,7 @@ socket_connect (rpc_transport_t *this, int port)
/* Make sure we are not vulnerable to someone setting
* net.ipv6.bindv6only to 1 so that gluster services are
- * avalable over IPv4 & IPv6.
+ * available over IPv4 & IPv6.
*/
#ifdef IPV6_DEFAULT
int disable_v6only = 0;
@@ -3562,7 +3562,7 @@ err:
/* Cleaup requires to send notification to upper layer which
intern holds the big_lock. There can be dead-lock situation
if big_lock is already held by the current thread.
- So transfer the ownership to seperate thread for cleanup.
+ So transfer the ownership to separate thread for cleanup.
*/
arg = GF_CALLOC (1, sizeof (*arg),
gf_sock_connect_error_state_t);
@@ -3645,7 +3645,7 @@ socket_listen (rpc_transport_t *this)
goto unlock;
}
- /* Cant help if setting socket options fails. We can continue
+ /* Can't help if setting socket options fails. We can continue
* working nonetheless.
*/
if (priv->windowsize != 0) {
diff --git a/rpc/xdr/src/glusterfs3.h b/rpc/xdr/src/glusterfs3.h
index 550b9a3ceb8..5e19f5e0133 100644
--- a/rpc/xdr/src/glusterfs3.h
+++ b/rpc/xdr/src/glusterfs3.h
@@ -725,7 +725,8 @@ dict_to_xdr (dict_t *this, gfx_dict *dict)
/* This is done for backward compatibility as dict is
heavily used for transporting data over wire.
- Ideally, whereever there is an issue, fix and move on */
+ Ideally, wherever there is an issue, fix and
+ move on */
xpair->value.gfx_value_u.other.other_val =
dpair->value->data;
xpair->value.gfx_value_u.other.other_len =