From: frank zago Date: Sun, 29 Mar 2015 15:35:19 +0000 (-0400) Subject: LU-5710 corrected some typos and grammar errors X-Git-Tag: 2.7.52~12 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e21b3025fa9f6bf7b02451ee0e7537306cafc1b8 LU-5710 corrected some typos and grammar errors Most of them are in comments, but there was a few in user visible help. Change-Id: Ib050e9042f9f2728cd3eeedeee679739b48419db Signed-off-by: frank zago Reviewed-on: http://review.whamcloud.com/12201 Tested-by: Jenkins Reviewed-by: James Simmons Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Oleg Drokin --- diff --git a/config/lustre-build-ldiskfs.m4 b/config/lustre-build-ldiskfs.m4 index a19ac4e..6f1ae82 100644 --- a/config/lustre-build-ldiskfs.m4 +++ b/config/lustre-build-ldiskfs.m4 @@ -200,7 +200,7 @@ AM_CONDITIONAL([LDISKFS_ENABLED], [test x$enable_ldiskfs = xyes]) # # LB_VALIDATE_EXT4_SRC_DIR # -# Spot check the existance of several source files common to ext4. +# Spot check the existence of several source files common to ext4. # Detecting this at configure time allows us to avoid a potential build # failure and provide a useful error message to explain what is wrong. # diff --git a/config/lustre-build.m4 b/config/lustre-build.m4 index 3745d92..89d4685 100644 --- a/config/lustre-build.m4 +++ b/config/lustre-build.m4 @@ -105,7 +105,7 @@ AC_SUBST(BUILDID) # # LB_CHECK_FILE # -# Check for file existance even when cross compiling +# Check for file existence even when cross compiling # $1 - file to check # $2 - do 'yes' # $3 - do 'no' @@ -499,7 +499,7 @@ AS_IF([test x$enable_server = xyes], # # The purpose of this function is to assemble command line options # for the rpmbuild command based on the options passed to the configure -# script, and also upon the descisions that configure makes based on +# script, and also upon the decisions that configure makes based on # the tests that it runs. # These strings can be passed to rpmbuild on the command line # in the Make targets named "rpms" and "srpm". diff --git a/libcfs/autoconf/lustre-libcfs.m4 b/libcfs/autoconf/lustre-libcfs.m4 index 24cc7f1..b6a796b 100644 --- a/libcfs/autoconf/lustre-libcfs.m4 +++ b/libcfs/autoconf/lustre-libcfs.m4 @@ -296,7 +296,7 @@ shrinker_count_objects, [ ((struct shrinker*)0)->count_objects(NULL, NULL); ],[ AC_DEFINE(HAVE_SHRINKER_COUNT, 1, - [shrinker has count_objects memeber]) + [shrinker has count_objects member]) ]) ]) diff --git a/libcfs/libcfs/util/l_ioctl.c b/libcfs/libcfs/util/l_ioctl.c index 89b1626..76b4f12 100644 --- a/libcfs/libcfs/util/l_ioctl.c +++ b/libcfs/libcfs/util/l_ioctl.c @@ -131,7 +131,7 @@ get_dump_file() /* * The dump file should start with a description of which devices are - * used, but for now it will assumed whatever app reads the file will + * used, but for now it will assume whatever app reads the file will * know what to do. */ int dump(int dev_id, unsigned int opc, void *buf) diff --git a/lnet/autoconf/lustre-lnet.m4 b/lnet/autoconf/lustre-lnet.m4 index a1194e4..b35d3a7 100644 --- a/lnet/autoconf/lustre-lnet.m4 +++ b/lnet/autoconf/lustre-lnet.m4 @@ -545,7 +545,7 @@ LN_CONFIG_DLC # # LN_CONDITIONALS # -# AM_CONDITOINAL defines for lnet +# AM_CONDITIONAL defines for lnet # AC_DEFUN([LN_CONDITIONALS], [ AM_CONDITIONAL(BUILD_O2IBLND, test x$O2IBLND = "xo2iblnd") diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 1180ac2..8f321a3 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -833,11 +833,11 @@ kiblnd_create_conn(kib_peer_t *peer, struct rdma_cm_id *cmid, conn->ibc_cq = cq; - rc = ib_req_notify_cq(cq, IB_CQ_NEXT_COMP); - if (rc != 0) { - CERROR("Can't request completion notificiation: %d\n", rc); - goto failed_2; - } + rc = ib_req_notify_cq(cq, IB_CQ_NEXT_COMP); + if (rc != 0) { + CERROR("Can't request completion notification: %d\n", rc); + goto failed_2; + } init_qp_attr->event_handler = kiblnd_qp_event; init_qp_attr->qp_context = conn; diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 02601e6..a4e2fb0 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -1497,9 +1497,9 @@ ksocknal_peer_failed (ksock_peer_t *peer) int notify = 0; cfs_time_t last_alive = 0; - /* There has been a connection failure or comms error; but I'll only - * tell LNET I think the peer is dead if it's to another kernel and - * there are no connections or connection attempts in existance. */ + /* There has been a connection failure or comms error; but I'll only + * tell LNET I think the peer is dead if it's to another kernel and + * there are no connections or connection attempts in existence. */ read_lock(&ksocknal_data.ksnd_global_lock); diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 45eec68..0e7e8cb 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -2938,13 +2938,13 @@ Details : When osc reconnect to OST, OST(filter)should clear grant info of Severity : normal Frequency : rare Bugzilla : 11662 -Description: Grant space more than avaiable left space sometimes. +Description: Grant space more than available left space sometimes. 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 - writing, which will cause grant space > avaiable space. + writing, which will cause grant space > available space. Severity : normal Frequency : when client is evicted diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 85632e6..b330964 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -1225,14 +1225,14 @@ posix_acl_to_xattr_user_namespace, [ # 3.8 struct file has new member f_inode # AC_DEFUN([LC_HAVE_FILE_F_INODE], [ -LB_CHECK_COMPILE([if 'struct file' has memeber 'f_inode'], +LB_CHECK_COMPILE([if 'struct file' has member 'f_inode'], file_f_inode, [ #include ],[ ((struct file *)0)->f_inode = NULL; ],[ AC_DEFINE(HAVE_FILE_F_INODE, 1, - [struct file has memeber f_inode]) + [struct file has member f_inode]) ]) ]) # LC_HAVE_FILE_F_INODE diff --git a/lustre/include/dt_object.h b/lustre/include/dt_object.h index 797b207..cb99e18 100644 --- a/lustre/include/dt_object.h +++ b/lustre/include/dt_object.h @@ -1107,7 +1107,7 @@ struct dt_body_operations { * at object's offset lnb_file_offset. * * The memory referenced by the descriptors can't change its purpose - * until the complimentary ->dbo_bufs_put() is called. The caller should + * until the complementary ->dbo_bufs_put() is called. The caller should * specify if the buffers are used to read or modify data so that OSD * can decide how to initialize the buffers: bring all the data for * reads or just bring partial buffers for write. Note: the method does @@ -1681,7 +1681,7 @@ enum dt_otable_it_flags { DOIF_DRYRUN = 0x0008, }; -/* otable based iteration needs to use the common DT interation APIs. +/* otable based iteration needs to use the common DT iteration APIs. * To initialize the iteration, it needs call dio_it::init() firstly. * Here is how the otable based iteration should prepare arguments to * call dt_it_ops::init(). diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h index eb8f6c7..40a2c52 100644 --- a/lustre/include/lustre/lustre_idl.h +++ b/lustre/include/lustre/lustre_idl.h @@ -985,7 +985,7 @@ enum lu_dirent_attrs { LUDA_TYPE = 0x0002, LUDA_64BITHASH = 0x0004, - /* The following attrs are used for MDT interanl only, + /* The following attrs are used for MDT internal only, * not visible to client */ /* Verify the dirent consistency */ diff --git a/lustre/include/lustre/lustreapi.h b/lustre/include/lustre/lustreapi.h index 6d2d512..f62ec17 100644 --- a/lustre/include/lustre/lustreapi.h +++ b/lustre/include/lustre/lustreapi.h @@ -331,9 +331,9 @@ extern int llapi_swap_layouts(const char *path1, const char *path2, /* Changelog interface. priv is private state, managed internally by these * functions */ -/* Records received are in extentded format now, though most of them are still +/* Records received are in extended format now, though most of them are still * written in disk in changelog_rec format (to save space and time), it's - * converted to extented format in the lustre api to ease changelog analysis. */ + * converted to extended format in the lustre api to ease changelog analysis. */ #define HAVE_CHANGELOG_EXTEND_REC 1 extern int llapi_changelog_start(void **priv, enum changelog_send_flag flags, diff --git a/lustre/include/lustre_fid.h b/lustre/include/lustre_fid.h index ce2e573..f9aa2c1 100644 --- a/lustre/include/lustre_fid.h +++ b/lustre/include/lustre_fid.h @@ -413,7 +413,7 @@ struct lu_server_seq { /* LUSTRE_SEQ_SERVER or LUSTRE_SEQ_CONTROLLER */ enum lu_mgr_type lss_type; - /* Client interafce to request controller */ + /* Client interface to request controller */ struct lu_client_seq *lss_cli; /* Mutex for protecting allocation */ diff --git a/lustre/include/obd.h b/lustre/include/obd.h index 5768ec2..85a1633 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -152,7 +152,7 @@ struct obd_info { /* statfs data specific for every OSC, if needed at all. */ struct obd_statfs *oi_osfs; /* An update callback which is called to update some data on upper - * level. E.g. it is used for update lsm->lsm_oinfo at every recieved + * level. E.g. it is used for update lsm->lsm_oinfo at every received * request in osc level for enqueue requests. It is also possible to * update some caller data from LOV layer if needed. */ obd_enqueue_update_f oi_cb_up; diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index e896549..13beaa4 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -774,7 +774,7 @@ do { \ * * Be very careful when changing this value, especially when decreasing it, * since vmalloc in Linux doesn't perform well on multi-cores system, calling - * vmalloc in critical path would hurt peformance badly. See LU-66. + * vmalloc in critical path would hurt performance badly. See LU-66. */ #define OBD_ALLOC_BIG (4 * PAGE_CACHE_SIZE) diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c index 101918e..dc9312e 100644 --- a/lustre/llite/dir.c +++ b/lustre/llite/dir.c @@ -708,7 +708,7 @@ int ll_get_mdt_idx(struct inode *inode) /** * Generic handler to do any pre-copy work. * - * It send a first hsm_progress (with extent length == 0) to coordinator as a + * It sends a first hsm_progress (with extent length == 0) to coordinator as a * first information for it that real work has started. * * Moreover, for a ARCHIVE request, it will sample the file data version and @@ -762,7 +762,7 @@ static int ll_ioc_copy_start(struct super_block *sb, struct hsm_copy *copy) GOTO(progress, rc); } - /* Store it the hsm_copy for later copytool use. + /* Store in the hsm_copy for later copytool use. * Always modified even if no lsm. */ copy->hc_data_version = data_version; } @@ -842,7 +842,7 @@ static int ll_ioc_copy_end(struct super_block *sb, struct hsm_copy *copy) GOTO(progress, rc); } - /* Store it the hsm_copy for later copytool use. + /* Store in the hsm_copy for later copytool use. * Always modified even if no lsm. */ hpk.hpk_data_version = data_version; diff --git a/lustre/lod/lod_object.c b/lustre/lod/lod_object.c index acec6fb..f8536d0 100644 --- a/lustre/lod/lod_object.c +++ b/lustre/lod/lod_object.c @@ -3440,7 +3440,7 @@ static int lod_declare_object_create(const struct lu_env *env, dt->do_body_ops = &lod_body_lnk_ops; /* - * it's lod_ah_init() who has decided the object will striped + * it's lod_ah_init() that has decided the object will be striped */ if (dof->dof_type == DFT_REGULAR) { /* callers don't want stripes */ diff --git a/lustre/mdt/mdt_coordinator.c b/lustre/mdt/mdt_coordinator.c index e4f8ec1..72ab938 100644 --- a/lustre/mdt/mdt_coordinator.c +++ b/lustre/mdt/mdt_coordinator.c @@ -312,7 +312,7 @@ static int mdt_coordinator_cb(const struct lu_env *env, struct hsm_progress_kernel pgs; dump_llog_agent_req_rec("mdt_coordinator_cb(): " - "request timeouted, start " + "request timed out, start " "cleaning", larr); /* a too old cancel request just needs to be removed * this can happen, if copy tool does not support cancel @@ -330,7 +330,7 @@ static int mdt_coordinator_cb(const struct lu_env *env, */ rc = mdt_hsm_update_request_state(hsd->mti, &pgs, 0); if (rc) - CERROR("%s: Cannot cleanup timeouted request: " + CERROR("%s: Cannot cleanup timed out request: " DFID" for cookie "LPX64" action=%s\n", mdt_obd_name(mdt), PFID(&pgs.hpk_fid), pgs.hpk_cookie, @@ -543,7 +543,7 @@ static int mdt_coordinator(void *data) CDEBUG(D_HSM, "Found %d requests to send and %d" " requests to cancel\n", hsd.request_cnt, hsd.cookie_cnt); - /* first we cancel llog records of the timeouted requests */ + /* first we cancel llog records of the timed out requests */ if (hsd.cookie_cnt > 0) { rc = mdt_agent_record_update(mti->mti_env, mdt, hsd.cookies, @@ -1270,7 +1270,7 @@ static int hsm_cdt_request_completed(struct mdt_thread_info *mti, * ENOSYS only if does not support cancel */ /* this can also happen when cdt calls it to - * for a timeouted request */ + * for a timed out request */ *status = ARS_FAILED; /* to have a cancel event in changelog */ pgs->hpk_errval = ECANCELED; diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c index 5124770..c038629 100644 --- a/lustre/mdt/mdt_handler.c +++ b/lustre/mdt/mdt_handler.c @@ -1261,7 +1261,7 @@ static int mdt_raw_lookup(struct mdt_thread_info *info, } /* - * UPDATE lock should be taken against parent, and be release before exit; + * UPDATE lock should be taken against parent, and be released before exit; * child_bits lock should be taken against child, and be returned back: * (1)normal request should release the child lock; * (2)intent request will grant the lock to client. @@ -2574,7 +2574,7 @@ void mdt_save_lock(struct mdt_thread_info *info, struct lustre_handle *h, * Unlock mdt object. * * Immeditely release the regular lock and the PDO lock or save the - * lock in reqeuest and keep them referenced until client ACK or + * lock in request and keep them referenced until client ACK or * transaction commit. * * \param info thread info object @@ -3648,7 +3648,7 @@ static int mdt_seq_init(const struct lu_env *env, struct mdt_device *mdt) GOTO(out_seq_fini, rc); if (ss->ss_node_id != 0) - /* register controler export through lwp */ + /* register controller export through lwp */ rc = mdt_register_seq_exp(mdt); EXIT; diff --git a/lustre/mdt/mdt_hsm_cdt_actions.c b/lustre/mdt/mdt_hsm_cdt_actions.c index c2c68d1..ff9b6b0 100644 --- a/lustre/mdt/mdt_hsm_cdt_actions.c +++ b/lustre/mdt/mdt_hsm_cdt_actions.c @@ -549,7 +549,7 @@ out: /** * lprocfs_release_hsm_actions() is called at end of /proc access. - * It frees allocated ressources and calls cleanup lprocfs methods. + * It frees allocated resources and calls cleanup lprocfs methods. */ static int lprocfs_release_hsm_actions(struct inode *inode, struct file *file) { diff --git a/lustre/mdt/mdt_hsm_cdt_agent.c b/lustre/mdt/mdt_hsm_cdt_agent.c index 158cced..622b1ca 100644 --- a/lustre/mdt/mdt_hsm_cdt_agent.c +++ b/lustre/mdt/mdt_hsm_cdt_agent.c @@ -505,7 +505,7 @@ int mdt_hsm_coordinator_update(struct mdt_thread_info *mti, int rc; ENTRY; - /* ask to coodinator to update request state and + /* ask to coordinator to update request state and * to record on disk the result */ rc = mdt_hsm_update_request_state(mti, pgs, 1); RETURN(rc); diff --git a/lustre/obdclass/lu_object.c b/lustre/obdclass/lu_object.c index 1ce045d..c097223 100644 --- a/lustre/obdclass/lu_object.c +++ b/lustre/obdclass/lu_object.c @@ -159,7 +159,7 @@ void lu_object_put(const struct lu_env *env, struct lu_object *o) } /* - * If object is dying (will not be cached), removed it + * If object is dying (will not be cached) then remove it * from hash table and LRU. * * This is done with hash table and LRU lists locked. As the only diff --git a/lustre/ofd/ofd_fs.c b/lustre/ofd/ofd_fs.c index be9a4ad..ba47f2d 100644 --- a/lustre/ofd/ofd_fs.c +++ b/lustre/ofd/ofd_fs.c @@ -249,7 +249,7 @@ out: * * LWP is lightweight proxy - simplified connection between * servers. It is used for FID Location Database (FLDB) and - * sequence (SEQ) client-server interations. + * sequence (SEQ) client-server interactions. * * This function is used during server cleanup process to free * LWP items that were previously set up upon OFD start. diff --git a/lustre/osd-zfs/osd_io.c b/lustre/osd-zfs/osd_io.c index c588256..03bd6e7 100644 --- a/lustre/osd-zfs/osd_io.c +++ b/lustre/osd-zfs/osd_io.c @@ -372,7 +372,7 @@ static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj, lnb->lnb_page = kmem_to_page(dbp[i]->db_data + bufoff); /* mark just a single slot: we need this - * reference to dbuf to be release once */ + * reference to dbuf to be released once */ lnb->lnb_data = dbf; dbf = NULL; @@ -385,7 +385,8 @@ static int osd_bufs_get_read(const struct lu_env *env, struct osd_object *obj, lnb++; } - /* steal dbuf so dmu_buf_rele_array() cant release it */ + /* steal dbuf so dmu_buf_rele_array() can't release + * it */ dbp[i] = NULL; } diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 4185eff..406af8b 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -1424,7 +1424,7 @@ int ptlrpc_import_recovery_state_machine(struct obd_import *imp) { struct task_struct *task; /* bug 17802: XXX client_disconnect_export vs connect request - * race. if client will evicted at this time, we start + * race. if client is evicted at this time then we start * invalidate thread without reference to import and import can * be freed at same time. */ class_import_get(imp); diff --git a/lustre/ptlrpc/nodemap_range.c b/lustre/ptlrpc/nodemap_range.c index 59371b1..3a43b2f 100644 --- a/lustre/ptlrpc/nodemap_range.c +++ b/lustre/ptlrpc/nodemap_range.c @@ -49,12 +49,12 @@ void range_init_tree(void) } /* - * callback for interating over the interval tree + * callback for iterating over the interval tree * * \param n interval_node matched * \param data void pointer for return * - * This dunction stops after a single match. There should be + * This function stops after a single match. There should be * no intervals containing multiple ranges */ static enum interval_iter range_cb(struct interval_node *n, void *data) diff --git a/lustre/ptlrpc/nrs.c b/lustre/ptlrpc/nrs.c index 8d1f479..205762e 100644 --- a/lustre/ptlrpc/nrs.c +++ b/lustre/ptlrpc/nrs.c @@ -1804,7 +1804,7 @@ fail: } /** - * Removes all policy desciptors from nrs_core::nrs_policies, and frees the + * Removes all policy descriptors from nrs_core::nrs_policies, and frees the * policy descriptors. * * Since all PTLRPC services are stopped at this point, there are no more diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 16d6125..3273dae 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -3022,7 +3022,7 @@ run_test 47 "server restart does not make client loss lru_resize settings" cleanup_48() { trap 0 - # reformat after this test is needed - if test will failed + # reformat after this test is needed - if the test fails, # we will have unkillable file at FS reformat_and_config } diff --git a/lustre/tests/create.pl b/lustre/tests/create.pl index 848b4cc..f740c18 100644 --- a/lustre/tests/create.pl +++ b/lustre/tests/create.pl @@ -85,7 +85,7 @@ sub usage () { print "\t--mountpt\tlocation of lustre mount\n"; print "\t--num_mounts=n\tnumber of lustre mounts to test across, default=-1 (single mount point without numeric suffix)\n\n"; print "example: $0 --mountpt=/mnt/lustre --num_mounts=2 --iterations=50\n"; - print " will perform 50 interations in /mnt/lustre1 and /mnt/lustre2\n"; + print " will perform 50 iterations in /mnt/lustre1 and /mnt/lustre2\n"; print " $0 --mountpt=/mnt/lustre --num_mounts=-1 --iterations=50\n"; print " will perform 50 iterations in /mnt/lustre only\n\n"; exit; diff --git a/lustre/tests/rename.pl b/lustre/tests/rename.pl index dd6b5dc..3629553 100644 --- a/lustre/tests/rename.pl +++ b/lustre/tests/rename.pl @@ -129,7 +129,7 @@ sub usage () { print "\t--mountpt\tlocation of lustre mount\n"; print "\t--num_mounts=n\tnumber of lustre mounts to test across, default=-1 (single mount point without numeric suffix)\n\n"; print "example: $0 --mountpt=/mnt/lustre --num_mounts=2 --iterations=50\n"; - print " will perform 50 interations in /mnt/lustre1 and /mnt/lustre2\n"; + print " will perform 50 iterations in /mnt/lustre1 and /mnt/lustre2\n"; print " $0 --mountpt=/mnt/lustre --num_mounts=-1 --iterations=50\n"; print " will perform 50 iterations in /mnt/lustre only\n\n"; exit; diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index 25f49a7..f657ec4 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -2659,7 +2659,7 @@ test_88() { #bug 17485 dd if=/dev/urandom of=$DIR/$tdir/f-$file_id bs=4096 count=128 done - # if the objids were not recreated, then "ls" will failed for -ENOENT + # if the objids were not recreated, then "ls" will fail with -ENOENT ls -l $DIR/$tdir/* || error "can't get the status of precreated files" local file_id diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c index f137103..b56b57b 100644 --- a/lustre/utils/lfs.c +++ b/lustre/utils/lfs.c @@ -151,7 +151,7 @@ static int lfs_mv(int argc, char **argv); "\n" \ "\tblock: Block file access during data migration\n" \ -/* all avaialable commands */ +/* all available commands */ command_t cmdlist[] = { {"setstripe", lfs_setstripe, 0, "Create a new file with a specific striping pattern or\n" @@ -398,9 +398,9 @@ static int lfs_migrate(char *name, __u64 migration_flags, } rc = llapi_file_get_stripe(name, lum); - /* failure can come from may case and some may be not real error + /* failure can happen for many reasons and some may be not real errors * (eg: no stripe) - * in case of a real error, a later call will failed with a better + * in case of a real error, a later call will fail with better * error management */ if (rc < 0) bufsz = 1024*1024; @@ -3945,8 +3945,8 @@ static int lfs_hsm_request(int argc, char **argv, int action) while ((rc = getline(&line, &len, fp)) != -1) { struct hsm_user_item *hui; - /* If allocated buffer was too small, gets something - * bigger */ + /* If allocated buffer was too small, get something + * larger */ if (nbfile_alloc <= hur->hur_request.hr_itemcount) { ssize_t size; nbfile_alloc = nbfile_alloc * 2 + 1; diff --git a/lustre/utils/liblustreapi.c b/lustre/utils/liblustreapi.c index fa4fe7d..4728779 100644 --- a/lustre/utils/liblustreapi.c +++ b/lustre/utils/liblustreapi.c @@ -1880,7 +1880,7 @@ enum tgt_type { /* * If uuidp is NULL, return the number of available obd uuids. * If uuidp is non-NULL, then it will return the uuids of the obds. If - * there are more OSTs then allocated to uuidp, then an error is returned with + * there are more OSTs than allocated to uuidp, then an error is returned with * the ost_count set to number of available obd uuids. */ static int llapi_get_target_uuids(int fd, struct obd_uuid *uuidp, diff --git a/lustre/utils/llobdstat b/lustre/utils/llobdstat index 7a89318..2e63840 100755 --- a/lustre/utils/llobdstat +++ b/lustre/utils/llobdstat @@ -11,7 +11,7 @@ sub usage() { print STDERR "Usage: $pname [ [}]\n"; print STDERR "where ost_name : ost name under /{proc,sys}/fs/lustre/obdfilter\n"; - print STDERR " interval : sample interaval in seconds\n"; + print STDERR " interval : sample interval in seconds\n"; print STDERR "example: $pname lustre-OST0000 2\n"; print STDERR "Use CTRL + C to stop statistics printing\n"; exit 1;