LU-9679 general: add missing spaces near punctuation

Many places in lustre fold a long string onto multiple lines, usually
at word breaks.  Sometimes the word-break has punctuation, such as
comma, colon, or period, but needs a space as well to be properly
readable.  Because the string is folded, the missing space isn't
immediately obvious in the code.

This patch adds those spaces after punctuation where is seems to be
needed, and joins the affected strings onto a single line, in accord
with current policy.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I9e76778b1e9687bc26e85500006b4b9d9ae6f93a
Reviewed-on: https://review.whamcloud.com/37402
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Shaun Tancheff <shaun.tancheff@hpe.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>

diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c
index 970f62c..d6358ff 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -548,8 +548,7 @@ kgnilnd_setup_immediate_buffer(kgn_tx_t *tx, unsigned int niov,
                         * which isn't allowed */
                        if ((kiov[i].kiov_offset != 0 && i > 0) ||
                            (kiov[i].kiov_offset + kiov[i].kiov_len != PAGE_SIZE && i < niov - 1)) {
-                               CNETERR("Can't make payload contiguous in I/O VM:"
-                                      "page %d, offset %u, nob %u, kiov_offset %u kiov_len %u \n",
+                               CNETERR("Can't make payload contiguous in I/O VM: page %d, offset %u, nob %u, kiov_offset %u, kiov_len %u\n",
                                       i, offset, nob, kiov->kiov_offset, kiov->kiov_len);
                                RETURN(-EINVAL);
                        }
@@ -713,8 +712,7 @@ kgnilnd_setup_phys_buffer(kgn_tx_t *tx, int nkiov, lnet_kiov_t *kiov,
                if ((phys != tx->tx_phys) &&
                    ((kiov->kiov_offset != 0) ||
                     ((kiov->kiov_len < PAGE_SIZE) && (nob > kiov->kiov_len)))) {
-                       CERROR("Can't make payload contiguous in I/O VM:"
-                              "page %d, offset %u, nob %u, kiov_offset %u kiov_len %u \n",
+                       CERROR("Can't make payload contiguous in I/O VM: page %d, offset %u, nob %u, kiov_offset %u, kiov_len %u\n",
                               (int)(phys - tx->tx_phys),
                               offset, nob, kiov->kiov_offset, kiov->kiov_len);
                        rc = -EINVAL;

diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c
index aaa9ad3..dc6d592 100644 (file)
--- a/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/lnet/klnds/o2iblnd/o2iblnd.c
@@ -2171,9 +2171,8 @@ again:
                /* another thread is allocating a new pool */
                spin_unlock(&ps->ps_lock);
                trips++;
-                CDEBUG(D_NET, "Another thread is allocating new "
-                      "%s pool, waiting %d HZs for her to complete."
-                      "trips = %d\n",
+               CDEBUG(D_NET,
+                      "Another thread is allocating new %s pool, waiting %d jiffies for her to complete. trips = %d\n",
                       ps->ps_name, interval, trips);
 
                schedule_timeout_interruptible(interval);

diff --git a/lnet/utils/lnetconfig/cyaml.c b/lnet/utils/lnetconfig/cyaml.c
index 0dcae12..e22e326 100644 (file)
--- a/lnet/utils/lnetconfig/cyaml.c
+++ b/lnet/utils/lnetconfig/cyaml.c
@@ -1207,8 +1207,7 @@ struct cYAML *cYAML_build_tree(char *yaml_file,
                rc = dispatch_tbl[token.type](&token, &tree);
                if (rc != CYAML_ERROR_NONE) {
                        snprintf(err_str, sizeof(err_str),
-                               "Failed to handle token:%d %s"
-                               "[state=%d, rc=%d]",
+                               "Failed to handle token:%d %s [state=%d, rc=%d]",
                                 token.type, token_type_string[token.type],
                                 tree.state, rc);
                        cYAML_build_error(-1, -1, "yaml", "builder",

diff --git a/lustre/fid/fid_request.c b/lustre/fid/fid_request.c
index 450d4aa..95eb71a 100644 (file)
--- a/lustre/fid/fid_request.c
+++ b/lustre/fid/fid_request.c
@@ -221,8 +221,8 @@ static int seq_client_alloc_seq(const struct lu_env *env,
                 rc = seq_client_alloc_meta(env, seq);
                 if (rc) {
                        if (rc != -EINPROGRESS)
-                               CERROR("%s: Can't allocate new meta-sequence,"
-                                      "rc = %d\n", seq->lcs_name, rc);
+                               CERROR("%s: Cannot allocate new meta-sequence: rc = %d\n",
+                                      seq->lcs_name, rc);
                         RETURN(rc);
                 } else {
                         CDEBUG(D_INFO, "%s: New range - "DRANGE"\n",

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 50bea97..2ca1314 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -194,8 +194,9 @@ void ll_intent_drop_lock(struct lookup_intent *it)
                if (it->it_remote_lock_mode != 0) {
                        handle.cookie = it->it_remote_lock_handle;
 
-                       CDEBUG(D_DLMTRACE, "releasing remote lock with cookie"
-                              "%#llx from it %p\n", handle.cookie, it);
+                       CDEBUG(D_DLMTRACE,
+                              "releasing remote lock with cookie %#llx from it %p\n",
+                              handle.cookie, it);
                        ldlm_lock_decref(&handle,
                                         it->it_remote_lock_mode);
                        it->it_remote_lock_mode = 0;

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index fdfab6a..7138a04 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -329,8 +329,9 @@ static int ll_readdir(struct file *filp, void *cookie, filldir_t filldir)
        else
                pos = 0;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p) pos/size"
-              "%lu/%llu 32bit_api %d\n", PFID(ll_inode2fid(inode)),
+       CDEBUG(D_VFSTRACE,
+              "VFS Op:inode="DFID"(%p) pos/size%lu/%llu 32bit_api %d\n",
+              PFID(ll_inode2fid(inode)),
               inode, (unsigned long)pos, i_size_read(inode), api32);
 
        if (pos == MDS_DIR_END_OFF)

diff --git a/lustre/llite/file.c b/lustre/llite/file.c
index 48ce0ac..75b82f7 100644 (file)
--- a/lustre/llite/file.c
+++ b/lustre/llite/file.c
@@ -3036,8 +3036,8 @@ static int ll_ladvise_sanity(struct inode *inode,
 
        if (advice > LU_LADVISE_MAX || advice == LU_LADVISE_INVALID) {
                rc = -EINVAL;
-               CDEBUG(D_VFSTRACE, "%s: advice with value '%d' not recognized,"
-                      "last supported advice is %s (value '%d'): rc = %d\n",
+               CDEBUG(D_VFSTRACE,
+                      "%s: advice with value '%d' not recognized, last supported advice is %s (value '%d'): rc = %d\n",
                       sbi->ll_fsname, advice,
                       ladvise_names[LU_LADVISE_MAX-1], LU_LADVISE_MAX-1, rc);
                GOTO(out, rc);
@@ -4100,8 +4100,8 @@ int ll_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 
        ENTRY;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:inode="DFID"(%p), start %lld, end %lld,"
-              "datasync %d\n",
+       CDEBUG(D_VFSTRACE,
+              "VFS Op:inode="DFID"(%p), start %lld, end %lld, datasync %d\n",
               PFID(ll_inode2fid(inode)), inode, start, end, datasync);
 
        /* fsync's caller has already called _fdata{sync,write}, we want

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 8098f27..de22581 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -988,8 +988,8 @@ static int ll_atomic_open(struct inode *dir, struct dentry *dentry,
        int rc = 0;
        ENTRY;
 
-       CDEBUG(D_VFSTRACE, "VFS Op:name=%.*s, dir="DFID"(%p), file %p,"
-                          "open_flags %x, mode %x opened %d\n",
+       CDEBUG(D_VFSTRACE,
+              "VFS Op:name=%.*s, dir="DFID"(%p), file %p, open_flags %x, mode %x opened %d\n",
               dentry->d_name.len, dentry->d_name.name,
               PFID(ll_inode2fid(dir)), dir, file, open_flags, mode,
               ll_is_opened(opened, file));

diff --git a/lustre/mdd/mdd_device.c b/lustre/mdd/mdd_device.c
index acb5d37..e915a94 100644 (file)
--- a/lustre/mdd/mdd_device.c
+++ b/lustre/mdd/mdd_device.c
@@ -779,9 +779,8 @@ static int obf_lookup(const struct lu_env *env, struct md_object *p,
 
        if (!fid_is_norm(f) && !fid_is_igif(f) && !fid_is_root(f) &&
            !fid_seq_is_dot(f->f_seq)) {
-               CWARN("%s: Trying to lookup invalid FID "DFID" in %s/%s, "
-                     "sequence should be >= %#llx or within [%#llx,"
-                     "%#llx].\n", mdd2obd_dev(mdd)->obd_name, PFID(f),
+               CWARN("%s: Trying to lookup invalid FID "DFID" in %s/%s, sequence should be >= %#llx or within [%#llx, %#llx].\n",
+                     mdd2obd_dev(mdd)->obd_name, PFID(f),
                      dot_lustre_name, mdd_obf_dir_name, (__u64)FID_SEQ_NORMAL,
                      (__u64)FID_SEQ_IGIF, (__u64)FID_SEQ_IGIF_MAX);
                GOTO(out, rc = -EINVAL);

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index fbf4847..d02399d 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -3104,10 +3104,9 @@ int mdt_remote_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 
                        rc = lu_env_init(&env, LCT_MD_THREAD);
                        if (unlikely(rc != 0)) {
-                               CWARN("%s: lu_env initialization failed, object"
-                                     "%p "DFID" is leaked!\n",
+                               CWARN("%s: lu_env initialization failed, object %p "DFID" is leaked!: rc = %d\n",
                                      obd->obd_name, mo,
-                                     PFID(mdt_object_fid(mo)));
+                                     PFID(mdt_object_fid(mo)), rc);
                                RETURN(rc);
                        }
 

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index 4bcc402..edc1edc 100644 (file)
--- a/lustre/obdclass/llog_osd.c
+++ b/lustre/obdclass/llog_osd.c
@@ -910,8 +910,9 @@ static int llog_osd_next_block(const struct lu_env *env,
        if (rc)
                GOTO(out, rc);
 
-       CDEBUG(D_OTHER, "looking for log index %u (cur idx %u off"
-              "%llu), size %llu\n", next_idx, *cur_idx,
+       CDEBUG(D_OTHER,
+              "looking for log index %u (cur idx %u off %llu), size %llu\n",
+              next_idx, *cur_idx,
               *cur_offset, lgi->lgi_attr.la_size);
 
        while (*cur_offset < lgi->lgi_attr.la_size) {

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 7365ad3..a639568 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -983,8 +983,8 @@ static int osc_lock_enqueue(const struct lu_env *env,
        if ((oscl->ols_flags & LDLM_FL_NO_EXPANSION) &&
            !(exp_connect_lockahead_old(exp) || exp_connect_lockahead(exp))) {
                result = -EOPNOTSUPP;
-               CERROR("%s: server does not support lockahead/locknoexpand:"
-                      "rc = %d\n", exp->exp_obd->obd_name, result);
+               CERROR("%s: server does not support lockahead/locknoexpand: rc = %d\n",
+                      exp->exp_obd->obd_name, result);
                RETURN(result);
        }
 

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 1fcf3d7..15f4397 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -997,11 +997,11 @@ void osc_init_grant(struct client_obd *cli, struct obd_connect_data *ocd)
        }
        spin_unlock(&cli->cl_loi_list_lock);
 
-       CDEBUG(D_CACHE, "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld."
-               "chunk bits: %d cl_max_extent_pages: %d\n",
-               cli_name(cli),
-               cli->cl_avail_grant, cli->cl_lost_grant, cli->cl_chunkbits,
-               cli->cl_max_extent_pages);
+       CDEBUG(D_CACHE,
+              "%s, setting cl_avail_grant: %ld cl_lost_grant: %ld. chunk bits: %d cl_max_extent_pages: %d\n",
+              cli_name(cli),
+              cli->cl_avail_grant, cli->cl_lost_grant, cli->cl_chunkbits,
+              cli->cl_max_extent_pages);
 
        if (OCD_HAS_FLAG(ocd, GRANT_SHRINK) && list_empty(&cli->cl_grant_chain))
                osc_add_grant_list(cli);

diff --git a/lustre/osd-zfs/osd_object.c b/lustre/osd-zfs/osd_object.c
index 63ab904..158ad52 100644 (file)
--- a/lustre/osd-zfs/osd_object.c
+++ b/lustre/osd-zfs/osd_object.c
@@ -1154,8 +1154,9 @@ static int osd_declare_attr_set(const struct lu_env *env,
                sa_object_size(obj->oo_sa_hdl, &blksize, &bspace);
                bspace = toqb(bspace * 512);
 
-               CDEBUG(D_QUOTA, "%s: enforce quota on UID %u, GID %u,"
-                      "the quota space is %lld (%u)\n", osd->od_svname,
+               CDEBUG(D_QUOTA,
+                      "%s: enforce quota on UID %u, GID %u, the quota space is %lld (%u)\n",
+                      osd->od_svname,
                       attr->la_uid, attr->la_gid, bspace, blksize);
        }
 

diff --git a/lustre/osp/osp_dev.c b/lustre/osp/osp_dev.c
index 8be3bab..4315731 100644 (file)
--- a/lustre/osp/osp_dev.c
+++ b/lustre/osp/osp_dev.c
@@ -752,9 +752,9 @@ static int osp_statfs(const struct lu_env *env, struct dt_device *dev,
        if (d->opd_pre == NULL)
                RETURN(0);
 
-       CDEBUG(D_OTHER, "%s: %llu blocks, %llu free, %llu avail, "
-              "%u reserved mb low, %u reserved mb high,"
-              "%llu files, %llu free files\n", d->opd_obd->obd_name,
+       CDEBUG(D_OTHER,
+              "%s: %llu blocks, %llu free, %llu avail, %u reserved mb low, %u reserved mb high, %llu files, %llu free files\n",
+              d->opd_obd->obd_name,
               sfs->os_blocks, sfs->os_bfree, sfs->os_bavail,
               d->opd_reserved_mb_low, d->opd_reserved_mb_high,
               sfs->os_files, sfs->os_ffree);

diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 4ae967d..7977d59 100644 (file)
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -1319,8 +1319,8 @@ finish:
        ptlrpc_prepare_replay(imp);
        rc = ptlrpc_import_recovery_state_machine(imp);
        if (rc == -ENOTCONN) {
-               CDEBUG(D_HA, "evicted/aborted by %s@%s during recovery;"
-                      "invalidating and reconnecting\n",
+               CDEBUG(D_HA,
+                      "evicted/aborted by %s@%s during recovery; invalidating and reconnecting\n",
                       obd2cli_tgt(imp->imp_obd),
                       imp->imp_connection->c_remote_uuid.uuid);
                ptlrpc_connect_import(imp);

diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c
index 895ace3..bc37679 100644 (file)
--- a/lustre/ptlrpc/layout.c
+++ b/lustre/ptlrpc/layout.c
@@ -2189,8 +2189,9 @@ void __req_capsule_dump(struct req_capsule *pill, enum req_location loc)
                         * have a specific dumper
                         */
                        len = req_capsule_get_size(pill, field, loc);
-                       CDEBUG(D_RPCTRACE, "Field %s has no dumper function;"
-                               "field size is %u\n", field->rmf_name, len);
+                       CDEBUG(D_RPCTRACE,
+                              "Field %s has no dumper function; field size is %u\n",
+                              field->rmf_name, len);
                } else {
                        /* It's dumping side-effect that we're interested in */
                        (void) __req_capsule_get(pill, field, loc, NULL, 1);

diff --git a/lustre/ptlrpc/nodemap_handler.c b/lustre/ptlrpc/nodemap_handler.c
index 6cea792..c847f40 100644 (file)
--- a/lustre/ptlrpc/nodemap_handler.c
+++ b/lustre/ptlrpc/nodemap_handler.c
@@ -1129,9 +1129,8 @@ struct lu_nodemap *nodemap_create(const char *name,
 
        OBD_ALLOC_PTR(nodemap);
        if (nodemap == NULL) {
-               CERROR("cannot allocate memory (%zu bytes)"
-                      "for nodemap '%s'\n", sizeof(*nodemap),
-                      name);
+               CERROR("cannot allocate memory (%zu bytes) for nodemap '%s'\n",
+                      sizeof(*nodemap), name);
                GOTO(out, rc = -ENOMEM);
        }
 

diff --git a/lustre/quota/qmt_entry.c b/lustre/quota/qmt_entry.c
index d3ed254..74ad463 100644 (file)
--- a/lustre/quota/qmt_entry.c
+++ b/lustre/quota/qmt_entry.c
@@ -432,8 +432,9 @@ int qmt_slv_write(const struct lu_env *env, struct thandle *th,
        rc = lquota_disk_write(env, th, slv_obj, &lqe->lqe_id,
                               (struct dt_rec *)rec, flags, ver);
        if (rc) {
-               LQUOTA_ERROR(lqe, "failed to update slave index "DFID" granted:"
-                            "%llu", PFID(lu_object_fid(&slv_obj->do_lu)),
+               LQUOTA_ERROR(lqe,
+                            "failed to update slave index "DFID" granted:%llu",
+                            PFID(lu_object_fid(&slv_obj->do_lu)),
                             granted);
                RETURN(rc);
        }

diff --git a/lustre/quota/qmt_handler.c b/lustre/quota/qmt_handler.c
index 9d2a4cc..0d23e85 100644 (file)
--- a/lustre/quota/qmt_handler.c
+++ b/lustre/quota/qmt_handler.c
@@ -140,8 +140,9 @@ int qmt_set_with_lqe(const struct lu_env *env, struct qmt_device *qmt,
        now = ktime_get_real_seconds();
 
        lqe_write_lock(lqe);
-       LQUOTA_DEBUG(lqe, "changing quota settings valid:%x hard:%llu soft:"
-                    "%llu time:%llu", valid, hard, soft, time);
+       LQUOTA_DEBUG(lqe,
+                    "changing quota settings valid:%x hard:%llu soft:%llu time:%llu",
+                    valid, hard, soft, time);
 
        if (is_default && lqe->lqe_id.qid_uid != 0) {
                LQUOTA_DEBUG(lqe, "set qid %llu to use default quota setting",
@@ -508,8 +509,8 @@ int qmt_dqacq0(const struct lu_env *env, struct lquota_entry *lqe,
                if (slv_granted < qb_count ||
                    lqe->lqe_granted < qb_count) {
                        /* can't release more than granted */
-                       LQUOTA_ERROR(lqe, "Release too much! uuid:%s release:"
-                                    "%llu granted:%llu, total:%llu",
+                       LQUOTA_ERROR(lqe,
+                                    "Release too much! uuid:%s release:%llu granted:%llu, total:%llu",
                                     obd_uuid2str(uuid), qb_count,
                                     slv_granted, lqe->lqe_granted);
                        GOTO(out_locked, rc = -EINVAL);

diff --git a/lustre/tests/reads.c b/lustre/tests/reads.c
index e358c57..5085c59 100644 (file)
--- a/lustre/tests/reads.c
+++ b/lustre/tests/reads.c
@@ -51,10 +51,7 @@ static void usage(void)
 {
        printf("reads: read random or stride chunks of a file.\n");
        printf("Usage:\n\n");
-       printf("reads -f <filename> -s <filesize> -b <buffersize>"
-              "-a <adjacent reads> [-v] [-h] [-C] [-l <stride_length> ] "
-              "[ -o <stride_offset> ] [-S <seed>] [-n <iterations>]"
-              "[-w <width>] [-t <timelimit>]\n");
+       printf("reads -f <filename> -s <filesize> -b <buffersize> -a <adjacent reads> [-v] [-h] [-C] [-l <stride_length> ] [ -o <stride_offset> ] [-S <seed>] [-n <iterations>][-w <width>] [-t <timelimit>]\n");
 }
 
 enum {