diff options
| -rwxr-xr-x | tests/basic/gfapi/gfapi-ssl-test.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/distribute/bug-915554.t | 2 | ||||
| -rw-r--r-- | tests/cluster.rc | 4 | ||||
| -rw-r--r-- | tests/volume.rc | 2 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-shared.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/ec/src/ec-helpers.c | 3 | ||||
| -rw-r--r-- | xlators/features/quota/src/quota-enforcer-client.c | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 6 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nlm4.h | 2 | ||||
| -rw-r--r-- | xlators/performance/nl-cache/src/nl-cache-helper.c | 2 |
10 files changed, 13 insertions, 14 deletions
diff --git a/tests/basic/gfapi/gfapi-ssl-test.t b/tests/basic/gfapi/gfapi-ssl-test.t index 3236625357d..937fcc83a4c 100755 --- a/tests/basic/gfapi/gfapi-ssl-test.t +++ b/tests/basic/gfapi/gfapi-ssl-test.t @@ -55,7 +55,7 @@ TEST $CLI volume delete $V0 cleanup; -# NetBSD build scripts are not upto date therefore this test +# NetBSD build scripts are not up to date therefore this test # is failing in NetBSD. Therefore skipping the test in NetBSD # as of now. #G_TESTDEF_TEST_STATUS_NETBSD7=KNOWN_ISSUE,BUG=000000 diff --git a/tests/bugs/distribute/bug-915554.t b/tests/bugs/distribute/bug-915554.t index 5caf4834b8c..1f59008c56f 100755 --- a/tests/bugs/distribute/bug-915554.t +++ b/tests/bugs/distribute/bug-915554.t @@ -59,7 +59,7 @@ done TEST $CLI volume rebalance $V0 start force -# check if rebalance has completed for upto 15 secs +# check if rebalance has completed for up to 15 secs EXPECT_WITHIN $REBALANCE_TIMEOUT "0" rebalance_completed diff --git a/tests/cluster.rc b/tests/cluster.rc index 48071647260..cd71e6494e8 100644 --- a/tests/cluster.rc +++ b/tests/cluster.rc @@ -141,8 +141,8 @@ function peer_count() { } function cluster_rebalance_status_field { - #The rebalance status can be upto 3 words, (ex:'fix-layout in progress'), hence the awk-print $7 thru $9. - #But if the status is less than 3 words, it also prints the next field i.e the run_time_in_secs.(ex:'completed 3.00'). + #The rebalance status can be up to 3 words, (e.g.:'fix-layout in progress'), hence the awk-print $7 thru $9. + #But if the status is less than 3 words, it also prints the next field i.e the run_time_in_secs.(e.g.:'completed 3.00'). #So we trim the numbers out with `tr`. Finally remove the trailing white spaces with sed. What we get is one of the #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c diff --git a/tests/volume.rc b/tests/volume.rc index c30c5fd2ea7..3aec6d4debb 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -73,7 +73,7 @@ function rebalance_status_field { } function fix-layout_status_field { - #The fix-layout status can be upto 3 words, (ex:'fix-layout in progress'), hence the awk-print $2 thru $4. + #The fix-layout status can be up to 3 words, (ex:'fix-layout in progress'), hence the awk-print $2 thru $4. #But if the status is less than 3 words, it also prints the next field i.e the run_time_in_secs.(ex:'completed 3.00'). #So we trim the numbers out with `tr`. Finally remove the trailing white spaces with sed. What we get is one of the #strings in the 'cli_vol_task_status_str' char array of cli-rpc-ops.c diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c index f84b40a8d91..d947ed401ec 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 upto number of cores available," + " or a number up to number of cores available," " not (%s), defaulting to (%d)", temp_str, conf->dthrottle); ret = -1; diff --git a/xlators/cluster/ec/src/ec-helpers.c b/xlators/cluster/ec/src/ec-helpers.c index 4e9771f5308..64b010fc480 100644 --- a/xlators/cluster/ec/src/ec-helpers.c +++ b/xlators/cluster/ec/src/ec-helpers.c @@ -366,8 +366,7 @@ int32_t ec_dict_del_config(dict_t * dict, char * key, ec_config_t * config) * instead of saying that it doesn't exist. * * We need to filter out this case and consider that a config xattr == 0 is - * the same than a non-existant xattr. Otherwise ec_config_check() will - * fail. + * the same as a non-existent xattr. Otherwise ec_config_check() will fail. */ if (data == 0) { return -ENODATA; diff --git a/xlators/features/quota/src/quota-enforcer-client.c b/xlators/features/quota/src/quota-enforcer-client.c index 6f36c081dbc..8011bacdf8c 100644 --- a/xlators/features/quota/src/quota-enforcer-client.c +++ b/xlators/features/quota/src/quota-enforcer-client.c @@ -199,7 +199,7 @@ out: if (priv->quotad_conn_status == 0) { /* retry connecting after 5secs for 12 retries - * (upto 60sec). + * (up to 60sec). */ gf_log (this->name, GF_LOG_DEBUG, "retry connecting to " "quotad (retry count %d)", diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index caa83b5a184..d42a0ce47e8 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -583,8 +583,8 @@ validate_defrag_throttle_option (glusterd_volinfo_t *volinfo, dict_t *dict, } else { ret = -1; snprintf (errstr, sizeof (errstr), "%s should be " - "{lazy|normal|aggressive} or a number upto number of" - " cores available (cores availble - %ld)", key, + "{lazy|normal|aggressive} or a number up to number of" + " cores available (cores available - %ld)", key, cores_available); gf_msg (this->name, GF_LOG_ERROR, EINVAL, GD_MSG_INVALID_ENTRY, "%s", errstr); @@ -3326,7 +3326,7 @@ struct volopt_map_entry glusterd_volopt_map[] = { .op_version = GD_OP_VERSION_3_11_0, .description = "enable/disable storing of entries that were lookedup" " and found to be present in the volume, thus lookup" - " on non existant file is served from the cache", + " on non existent file is served from the cache", }, { .key = "performance.nl-cache-limit", .voltype = "performance/nl-cache", diff --git a/xlators/nfs/server/src/nlm4.h b/xlators/nfs/server/src/nlm4.h index c7da5d62193..f9d254e2a37 100644 --- a/xlators/nfs/server/src/nlm4.h +++ b/xlators/nfs/server/src/nlm4.h @@ -62,7 +62,7 @@ #elif defined(__NetBSD__) #define GF_RPC_STATD_PROG "/usr/sbin/rpc.statd" #define GF_RPC_STATD_PIDFILE "/var/run/rpc.statd.pid" -#define GF_SM_NOTIFY_PIDFILE "/var/run/inexistant.pid" +#define GF_SM_NOTIFY_PIDFILE "/var/run/inexistent.pid" #else #define GF_RPC_STATD_PROG "/sbin/rpc.statd" #define GF_RPC_STATD_PIDFILE "/var/run/rpc.statd.pid" diff --git a/xlators/performance/nl-cache/src/nl-cache-helper.c b/xlators/performance/nl-cache/src/nl-cache-helper.c index edc8c1639fe..0c19d21206b 100644 --- a/xlators/performance/nl-cache/src/nl-cache-helper.c +++ b/xlators/performance/nl-cache/src/nl-cache-helper.c @@ -834,7 +834,7 @@ nlc_dir_add_ne (xlator_t *this, inode_t *inode, const char *name) { /* There is one possiblility where we need to search before * adding NE: when there are two parallel lookups on a non - * existant file */ + * existent file */ if (!__nlc_search_ne (nlc_ctx, name)) { __nlc_add_ne (this, nlc_ctx, name); __nlc_set_dir_state (nlc_ctx, NLC_NE_VALID); |