From 70bb27b746c1e80196815e335c08bdc113ef052a Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Fri, 20 Nov 2015 10:51:33 -0600 Subject: [PATCH] LU-5710 all: fourth set of corrected typos and grammar errors All the typos are in comments or logs. Signed-off-by: frank zago Change-Id: If7973c31e73759f7e16c6f8d6a93c6453de8cb2b Reviewed-on: http://review.whamcloud.com/17306 Tested-by: Jenkins Reviewed-by: Dmitry Eremin Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lnet/include/lnet/lib-types.h | 8 ++++---- lnet/include/lnet/types.h | 4 ++-- lnet/klnds/gnilnd/gnilnd_cb.c | 2 +- lnet/klnds/gnilnd/gnilnd_conn.c | 5 +++-- lustre/ChangeLog | 2 +- lustre/autoconf/lustre-core.m4 | 6 +++--- lustre/contrib/wireshark/wsconfig.sh | 2 +- lustre/fid/fid_handler.c | 2 +- lustre/include/lustre_net.h | 2 +- lustre/osp/osp_precreate.c | 2 +- lustre/ptlrpc/nodemap_idmap.c | 2 +- lustre/quota/qmt_pool.c | 6 +++--- lustre/target/tgt_lastrcvd.c | 2 +- lustre/tests/conf-sanity.sh | 2 +- lustre/tests/sanity-lfsck.sh | 2 +- 15 files changed, 25 insertions(+), 24 deletions(-) diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h index 1cc79b2..fca5446 100644 --- a/lnet/include/lnet/lib-types.h +++ b/lnet/include/lnet/lib-types.h @@ -76,11 +76,11 @@ typedef struct lnet_msg { lnet_nid_t msg_from; __u32 msg_type; - /* commited for sending */ + /* committed for sending */ unsigned int msg_tx_committed:1; /* CPT # this message committed for sending */ unsigned int msg_tx_cpt:15; - /* commited for receiving */ + /* committed for receiving */ unsigned int msg_rx_committed:1; /* CPT # this message committed for receiving */ unsigned int msg_rx_cpt:15; @@ -497,7 +497,7 @@ struct lnet_match_table { unsigned int mt_cpt; unsigned int mt_portal; /* portal index */ /* match table is set as "enabled" if there's non-exhausted MD - * attached on mt_mhash, it's only valide for wildcard portal */ + * attached on mt_mhash, it's only valid for wildcard portal */ unsigned int mt_enabled; /* bitmap to flag whether MEs on mt_hash are exhausted or not */ __u64 mt_exhausted[LNET_MT_EXHAUSTED_BMAP]; @@ -519,7 +519,7 @@ typedef struct lnet_portal { unsigned int ptl_index; /* portal ID, reserved */ /* flags on this portal: lazy, unique... */ unsigned int ptl_options; - /* list of messags which are stealing buffer */ + /* list of messages which are stealing buffer */ struct list_head ptl_msg_stealing; /* messages blocking for MD */ struct list_head ptl_msg_delayed; diff --git a/lnet/include/lnet/types.h b/lnet/include/lnet/types.h index 0ffad86..119da94 100644 --- a/lnet/include/lnet/types.h +++ b/lnet/include/lnet/types.h @@ -213,8 +213,8 @@ typedef struct { #define LNET_PROTO_PING_MAGIC 0x70696E67 /* 'ping' */ /* Placeholder for a future "unified" protocol across all LNDs */ -/* Current LNDs that receive a request with this magic will respond with a - * * * "stub" reply using their current protocol */ +/* Current LNDs that receive a request with this magic will respond + * with a "stub" reply using their current protocol */ #define LNET_PROTO_MAGIC 0x45726963 /* ! */ #define LNET_PROTO_TCP_VERSION_MAJOR 1 diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c index ab86f2c..5d8e924 100644 --- a/lnet/klnds/gnilnd/gnilnd_cb.c +++ b/lnet/klnds/gnilnd/gnilnd_cb.c @@ -3072,7 +3072,7 @@ kgnilnd_reaper(void *arg) next_check_time); mod_timer(&timer, (long) jiffies + timeout); - /* check flag variables before comitting */ + /* check flag variables before committing */ if (!kgnilnd_data.kgn_shutdown && !kgnilnd_data.kgn_quiesce_trigger) { CDEBUG(D_INFO, "schedule timeout %ld (%lu sec)\n", diff --git a/lnet/klnds/gnilnd/gnilnd_conn.c b/lnet/klnds/gnilnd/gnilnd_conn.c index 408ca65..7ec96a2 100644 --- a/lnet/klnds/gnilnd/gnilnd_conn.c +++ b/lnet/klnds/gnilnd/gnilnd_conn.c @@ -2513,8 +2513,9 @@ kgnilnd_dgram_mover(void *arg) /* last second chance for others to poke us */ did_something += xchg(&dev->gnd_dgram_ready, GNILND_DGRAM_IDLE); - /* check flag variables before comittingi even if we did something; - * if we are after the deadline call schedule */ + /* check flag variables before committing even if we + * did something; if we are after the deadline call + * schedule */ if ((!did_something || time_after(jiffies, deadline)) && !kgnilnd_data.kgn_shutdown && !kgnilnd_data.kgn_quiesce_trigger) { diff --git a/lustre/ChangeLog b/lustre/ChangeLog index b2f1a23..46324a3 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2953,7 +2953,7 @@ Details : When then OST is about to be full, if two bulk writing from different clients came to OST. Accord the avaliable space of the OST, the first req should be permitted, and the second one should be denied by ENOSPC. But if the seconde arrived before - the first one is commited. The OST might wrongly permit second + the first one is committed. The OST might wrongly permit second writing, which will cause grant space > available space. Severity : normal diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 645d27b..b8285d0 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -89,10 +89,10 @@ LB_CHECK_EXPORT([dev_set_rdonly], [block/ll_rw_block.c block/blk-core.c], # # LC_STACK_SIZE # -# Ensure stack size big than 8k in Lustre server (all kernels) +# Ensure the stack size is at least 8k in Lustre server (all kernels) # AC_DEFUN([LC_STACK_SIZE], [ -LB_CHECK_COMPILE([if stack size big than 8k], +LB_CHECK_COMPILE([if stack size is at least 8k], stack_size_8k, [ #include ], [ @@ -636,7 +636,7 @@ EXTRA_KCFLAGS="$tmp_flags" # # LC_DCACHE_LOCK # -# 2.6.38 dcache_lock removed. rcu-walk commited. +# 2.6.38 dcache_lock removed. rcu-walk committed. # AC_DEFUN([LC_DCACHE_LOCK], [ LB_CHECK_COMPILE([if 'dcache_lock' is exist], diff --git a/lustre/contrib/wireshark/wsconfig.sh b/lustre/contrib/wireshark/wsconfig.sh index 7fbe6de..2934468 100644 --- a/lustre/contrib/wireshark/wsconfig.sh +++ b/lustre/contrib/wireshark/wsconfig.sh @@ -33,7 +33,7 @@ # Space separate list of RPMs needed to be installed for # compilation of wireshark - # Package name(s) (can) vary between differnt distributions + # Package name(s) (can) vary between different distributions # If distributions 'marked' by same release file, content has to # parsed and variable PREREQUISITE_RPMS has to be set accoringly to # package name(s) used for each distro. diff --git a/lustre/fid/fid_handler.c b/lustre/fid/fid_handler.c index 98c94f1..9f378a5 100644 --- a/lustre/fid/fid_handler.c +++ b/lustre/fid/fid_handler.c @@ -211,7 +211,7 @@ static int __seq_set_init(const struct lu_env *env, * * when lss_lowater_set reaches the end it is replaced with hiwater one and * a write operation is initiated to allocate new hiwater range. - * if last seq write opearion is still not commited, current operation is + * if last seq write opearion is still not committed, current operation is * flaged as sync write op. */ static int range_alloc_set(const struct lu_env *env, diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index f15c3c9..5ba35e3 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -1032,7 +1032,7 @@ struct ptlrpc_request { /** bulk match bits */ __u64 rq_mbits; /** - * List item to for replay list. Not yet commited requests get linked + * List item to for replay list. Not yet committed requests get linked * there. * Also see \a rq_replay comment above. * It's also link chain on obd_export::exp_req_replay_queue diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c index cac5bf2..c03eea9 100644 --- a/lustre/osp/osp_precreate.c +++ b/lustre/osp/osp_precreate.c @@ -965,7 +965,7 @@ void osp_pre_update_status(struct osp_device *d, int rc) msfs->os_bfree, used, msfs->os_bavail, d->opd_pre_status, rc); CDEBUG(D_INFO, - "non-commited changes: %lu, in progress: %u\n", + "non-committed changes: %lu, in progress: %u\n", d->opd_syn_changes, d->opd_syn_rpc_in_progress); } else if (old == -ENOSPC) { d->opd_pre_status = 0; diff --git a/lustre/ptlrpc/nodemap_idmap.c b/lustre/ptlrpc/nodemap_idmap.c index 91dec43..a03cf82 100644 --- a/lustre/ptlrpc/nodemap_idmap.c +++ b/lustre/ptlrpc/nodemap_idmap.c @@ -245,7 +245,7 @@ struct lu_idmap *idmap_search(struct lu_nodemap *nodemap, * * \param nodemap nodemap to delete trees from * - * This uses the postorder safe traversal code that is commited + * This uses the postorder safe traversal code that is committed * in a later kernel. Each lu_idmap strucuture is destroyed. */ void idmap_delete_tree(struct lu_nodemap *nodemap) diff --git a/lustre/quota/qmt_pool.c b/lustre/quota/qmt_pool.c index 55c6dc2..78e1acb 100644 --- a/lustre/quota/qmt_pool.c +++ b/lustre/quota/qmt_pool.c @@ -379,7 +379,7 @@ void qmt_pool_fini(const struct lu_env *env, struct qmt_device *qmt) * pool which are instantiated in this function. * * \param env - is the environment passed by the caller - * \param qmt - is the quota master target for which we have to initializa the + * \param qmt - is the quota master target for which we have to initialize the * pool configuration * * \retval - 0 on success, appropriate error on failure @@ -438,7 +438,7 @@ static int qmt_slv_cnt(const struct lu_env *env, struct lu_fid *glb_fid, * Set up on-disk index files associated with each pool. * * \param env - is the environment passed by the caller - * \param qmt - is the quota master target for which we have to initializa the + * \param qmt - is the quota master target for which we have to initialize the * pool configuration * \param qmt_root - is the on-disk directory created for the QMT. * @@ -650,7 +650,7 @@ out: * Look-up a lquota_entry in the pool hash and allocate it if not found. * * \param env - is the environment passed by the caller - * \param qmt - is the quota master target for which we have to initializa the + * \param qmt - is the quota master target for which we have to initialize the * pool configuration * \param pool_id - is the 16-bit identifier of the pool * \param pool_type - is the pool type, either LQUOTA_RES_MD or LQUOTA_RES_DT. diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c index 1bb9b9b..1c8f206 100644 --- a/lustre/target/tgt_lastrcvd.c +++ b/lustre/target/tgt_lastrcvd.c @@ -749,7 +749,7 @@ void tgt_boot_epoch_update(struct lu_target *tgt) } /** - * commit callback, need to update last_commited value + * commit callback, need to update last_committed value */ struct tgt_last_committed_callback { struct dt_txn_commit_cb llcc_cb; diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 1c38538..4d64693 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -52,7 +52,7 @@ init_test_env $@ . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} # use small MDS + OST size to speed formatting time -# do not use too small MDSSIZE/OSTSIZE, which affect the default jouranl size +# do not use too small MDSSIZE/OSTSIZE, which affect the default journal size # STORED_MDSSIZE is used in test_18 STORED_MDSSIZE=$MDSSIZE STORED_OSTSIZE=$OSTSIZE diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh index 9290efd..e3f0c74 100644 --- a/lustre/tests/sanity-lfsck.sh +++ b/lustre/tests/sanity-lfsck.sh @@ -4134,7 +4134,7 @@ test_31f() { check_mount_and_prep echo "Inject failure stub on MDT0 to simulate the case that the" - echo "slave MDT-object (that resides on differnt MDT as the master" + echo "slave MDT-object (that resides on different MDT as the master" echo "MDT-object resides on) lost the LMV EA." #define OBD_FAIL_LFSCK_LOST_SLAVE_LMV 0x162a -- 1.8.3.1