diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-06-30 10:58:33 -0400 | 
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2017-07-01 15:58:24 +0000 | 
| commit | 763d04016f94a32b74e163ecda840ed4114e3435 (patch) | |
| tree | 9b03ae1d468124f8f23976a0d5c3a9bd87fe1228 | |
| parent | bc4d14d3af603c10f61f7d5bf45284ab29f6e494 (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
release-3.11 BUG: 1466801
release-3.11 https://review.gluster.org/17661
Change-Id: I5393819a2fc9f240a19811143bb57b127df717cf
BUG: 1466852
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/17663
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra Talur <rtalur@redhat.com>
| -rw-r--r-- | libglusterfs/src/event-epoll.c | 24 | ||||
| -rw-r--r-- | xlators/features/trash/src/trash.c | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 9 | 
3 files changed, 20 insertions, 18 deletions
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c index e2b40602e7a..aeed5fbb330 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/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index e321a05a01b..ab01832bb8b 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 d5f9fcf00a8..dac9d4eabfd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -3176,10 +3176,11 @@ struct volopt_map_entry glusterd_volopt_map[] = {            .value       = "off",            .type        = DOC,            .op_version  = GD_OP_VERSION_3_10_0, -          .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",  | 
