diff options
| -rw-r--r-- | libglusterfs/src/event-epoll.c | 24 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 2 | ||||
| -rw-r--r-- | xlators/features/trash/src/trash.c | 5 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 9 |
4 files changed, 21 insertions, 19 deletions
diff --git a/libglusterfs/src/event-epoll.c b/libglusterfs/src/event-epoll.c index 4b76cc96fd3..eac1f058b15 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 0814db3fe18..a75c61190df 100644 --- a/xlators/cluster/dht/src/dht-shared.c +++ b/xlators/cluster/dht/src/dht-shared.c @@ -431,7 +431,7 @@ dht_configure_throttle (xlator_t *this, dht_conf_t *conf, char *temp_str) DHT_MSG_INVALID_OPTION, "Invalid option: Reconfigure: " "rebal-throttle should be {lazy|normal|aggressive}" - " or a number up to 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 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 8d315d606ba..629d18ff507 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -3345,10 +3345,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", |