summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2017-06-30 09:52:37 -0400
committerShyamsundar Ranganathan <srangana@redhat.com>2017-07-03 12:47:48 +0000
commit109b6f34ca12e5f5de68ece43e4a425cbb6249d4 (patch)
tree06170268b56f14f2728a6c923567299f2fbc51e2
parent1764ba4654bcdac9155e81727e1467b024e4a01b (diff)
core: assorted typos and spelling mistakes from Debian lintian
Plus minor readability improvements. Reported-by: pmatthaei@debian.org master BUG: 1466785 master https://review.gluster.org/17660 Change-Id: I5393819a2fc9f240a19811143bb57b127df717cf BUG: 1466801 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: https://review.gluster.org/17661 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
-rw-r--r--libglusterfs/src/event-epoll.c24
-rw-r--r--xlators/cluster/dht/src/dht-shared.c2
-rw-r--r--xlators/features/trash/src/trash.c5
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c9
4 files changed, 21 insertions, 19 deletions
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c
index 4b76cc9..eac1f05 100644
--- a/libglusterfs/src/event-epoll.c
+++ b/libglusterfs/src/event-epoll.c
@@ -482,18 +482,18 @@ event_select_on_epoll (struct event_pool *event_pool, int fd, int idx,
ev_data->gen = slot->gen;
if (slot->in_handler)
- /* in_handler indicates at least one thread
- executing event_dispatch_epoll_handler()
- which will perform epoll_ctl(EPOLL_CTL_MOD)
- anyways (because of EPOLLET)
-
- This not only saves a system call, but also
- avoids possibility of another epoll thread
- parallely picking up the next event while the
- ongoing handler is still in progress (and
- resulting in unnecessary contention on
- rpc_transport_t->mutex).
- */
+ /*
+ * in_handler indicates at least one thread
+ * executing event_dispatch_epoll_handler()
+ * which will perform epoll_ctl(EPOLL_CTL_MOD)
+ * anyways (because of EPOLLET)
+ *
+ * This not only saves a system call, but also
+ * avoids possibility of another epoll thread
+ * picking up the next event while the ongoing
+ * handler is still in progress (and resulting
+ * in unnecessary contention on rpc_transport_t->mutex).
+ */
goto unlock;
ret = epoll_ctl (event_pool->fd, EPOLL_CTL_MOD, fd,
diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c
index 9c3eb16..8f75e02 100644
--- a/xlators/cluster/dht/src/dht-shared.c
+++ b/xlators/cluster/dht/src/dht-shared.c
@@ -489,7 +489,7 @@ dht_reconfigure (xlator_t *this, dict_t *options)
DHT_MSG_INVALID_OPTION,
"Invalid option: Reconfigure: "
"rebal-throttle should be {lazy|normal|aggressive}"
- " or a number upto number of cores available,"
+ " or a number up to the number of cores available,"
" not (%s), defaulting to (%d)",
temp_str, conf->dthrottle);
ret = -1;
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c
index e321a05..ab01832 100644
--- a/xlators/features/trash/src/trash.c
+++ b/xlators/features/trash/src/trash.c
@@ -1889,8 +1889,9 @@ trash_truncate_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
*/
if (buf->ia_size > (priv->max_trash_file_size) ||
buf->ia_size <= local->fop_offset) {
- gf_log (this->name, GF_LOG_DEBUG, "%s: not moving to trash , "
- "having inappropiate file size", local->loc.path);
+ gf_log (this->name, GF_LOG_DEBUG,
+ "%s: file is too large to move to trash",
+ local->loc.path);
STACK_WIND (frame, trash_common_unwind_buf_cbk,
FIRST_CHILD(this),
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index b2ad136..80592d4 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -3275,10 +3275,11 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.type = DOC,
.op_version = GD_OP_VERSION_3_10_0,
.validate_fn = validate_parallel_readdir,
- .description = "If this option is enabled, the readdir operation is "
- "performed parallely on all the bricks, thus improving"
- " the performance of readdir. Note that the performance"
- "improvement is higher in large clusters"
+ .description = "If this option is enabled, the readdir operation "
+ "is performed in parallel on all the bricks, thus "
+ "improving the performance of readdir. Note that "
+ "the performance improvement is higher in large "
+ "clusters"
},
{ .key = "performance.rda-request-size",
.voltype = "performance/readdir-ahead",