LU-9679 general: add missing spaces to folded strings.

Many places in lustre fold a long string onto multiple lines,
usually at word breaks.  Sometimes the space between those words
got lost.
In a couple of places, a newline (n) rather than a space was lost.

This patch adds those spaces (and newlines) back in.

Where a space was added, the whole string is joined onto a
single line as this is current policy - encouraged by checkpatch.

In a couple of places neighbouring strings are also joined
into a single line, and some code has been re-indented to use
TABs.

Where the missing space was in a .diff file, the string hasn't
been joined into a line, as it doesn't seem worth the churn.

Test-Parameters: trivial
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I6882bb957df566da0794f4ee85133dbf8c3debc1
Reviewed-on: https://review.whamcloud.com/36653
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.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 c65dfa2..812f6f2 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd_cb.c
+++ b/lnet/klnds/gnilnd/gnilnd_cb.c
@@ -2884,8 +2884,9 @@ kgnilnd_check_peer_timeouts_locked(kgn_peer_t *peer, struct list_head *todie,
 
                CDEBUG(D_NET, "starting connect to %s\n",
                        libcfs_nid2str(peer->gnp_nid));
 
                CDEBUG(D_NET, "starting connect to %s\n",
                        libcfs_nid2str(peer->gnp_nid));

-               LASSERTF(peer->gnp_connecting == GNILND_PEER_IDLE, "Peer was idle and we"
-                       "have a write_lock, state issue %d\n", peer->gnp_connecting);
+               LASSERTF(peer->gnp_connecting == GNILND_PEER_IDLE,
+                        "Peer was idle and we have a write_lock, state issue %d\n",
+                        peer->gnp_connecting);

 
                peer->gnp_connecting = GNILND_PEER_CONNECT;
                kgnilnd_peer_addref(peer); /* extra ref for connd */
 
                peer->gnp_connecting = GNILND_PEER_CONNECT;
                kgnilnd_peer_addref(peer); /* extra ref for connd */


@@ -3533,8 +3534,7 @@ kgnilnd_check_fma_rcv_cq(kgn_device_t *dev)
                                /* set overrun too */
                                event_data |= (1UL << 63);
                                LASSERTF(GNI_CQ_OVERRUN(event_data),
                                /* set overrun too */
                                event_data |= (1UL << 63);
                                LASSERTF(GNI_CQ_OVERRUN(event_data),

-                                        "(1UL << 63) is no longer the bit to"
-                                        "set to indicate CQ_OVERRUN\n");
+                                        "(1UL << 63) is no longer the bit to set to indicate CQ_OVERRUN\n");

                        }
                }
                /* sender should get error event too and take care
                        }
                }
                /* sender should get error event too and take care

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 390185d..091637f 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -1873,11 +1873,11 @@ ksocknal_recv_hello(struct lnet_ni *ni, struct ksock_conn *conn,
 
         *incarnation = hello->kshm_src_incarnation;
 
 
         *incarnation = hello->kshm_src_incarnation;
 

-        if (hello->kshm_src_nid == LNET_NID_ANY) {
-                CERROR("Expecting a HELLO hdr with a NID, but got LNET_NID_ANY"
-                      "from %pI4h\n", &conn->ksnc_ipaddr);
-                return -EPROTO;
-        }
+       if (hello->kshm_src_nid == LNET_NID_ANY) {
+               CERROR("Expecting a HELLO hdr with a NID, but got LNET_NID_ANY from %pI4h\n",
+                      &conn->ksnc_ipaddr);
+               return -EPROTO;
+       }

 
         if (!active &&
             conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {
 
         if (!active &&
             conn->ksnc_port > LNET_ACCEPTOR_MAX_RESERVED_PORT) {

diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c
index 3f48c7b..94d16fa 100644 (file)
--- a/lnet/lnet/acceptor.c
+++ b/lnet/lnet/acceptor.c
@@ -240,8 +240,7 @@ lnet_accept(struct socket *sock, __u32 magic)
                                               accept_timeout);
 
                        if (rc != 0)
                                               accept_timeout);
 
                        if (rc != 0)

-                               CERROR("Error sending magic+version in response"
-                                      "to LNET magic from %pI4h: %d\n",
+                               CERROR("Error sending magic+version in response to LNET magic from %pI4h: %d\n",

                                       &peer_ip, rc);
                        return -EPROTO;
                }
                                       &peer_ip, rc);
                        return -EPROTO;
                }


@@ -286,8 +285,7 @@ lnet_accept(struct socket *sock, __u32 magic)
                                       accept_timeout);
 
                if (rc != 0)
                                       accept_timeout);
 
                if (rc != 0)

-                       CERROR("Error sending magic+version in response"
-                              "to version %d from %pI4h: %d\n",
+                       CERROR("Error sending magic+version in response to version %d from %pI4h: %d\n",

                               peer_version, &peer_ip, rc);
                return -EPROTO;
        }
                               peer_version, &peer_ip, rc);
                return -EPROTO;
        }

diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c
index 615d755..64dcd84 100644 (file)
--- a/lnet/lnet/lib-move.c
+++ b/lnet/lnet/lib-move.c
@@ -4399,8 +4399,8 @@ lnet_parse(struct lnet_ni *ni, struct lnet_hdr *hdr, lnet_nid_t from_nid,
 
        if (!list_empty(&the_lnet.ln_drop_rules) &&
            lnet_drop_rule_match(hdr, ni->ni_nid, NULL)) {
 
        if (!list_empty(&the_lnet.ln_drop_rules) &&
            lnet_drop_rule_match(hdr, ni->ni_nid, NULL)) {

-               CDEBUG(D_NET, "%s, src %s, dst %s: Dropping %s to simulate"
-                             "silent message loss\n",
+               CDEBUG(D_NET,
+                      "%s, src %s, dst %s: Dropping %s to simulate silent message loss\n",

                       libcfs_nid2str(from_nid), libcfs_nid2str(src_nid),
                       libcfs_nid2str(dest_nid), lnet_msgtyp2str(type));
                goto drop;
                       libcfs_nid2str(from_nid), libcfs_nid2str(src_nid),
                       libcfs_nid2str(dest_nid), lnet_msgtyp2str(type));
                goto drop;

diff --git a/lustre/lfsck/lfsck_namespace.c b/lustre/lfsck/lfsck_namespace.c
index f5a30bd..14ed2a5 100644 (file)
--- a/lustre/lfsck/lfsck_namespace.c
+++ b/lustre/lfsck/lfsck_namespace.c
@@ -3248,11 +3248,8 @@ static int lfsck_namespace_double_scan_dir(const struct lu_env *env,
 
        if (flags & (LNTF_CHECK_LINKEA | LNTF_CHECK_PARENT) &&
            !(lfsck->li_bookmark_ram.lb_param & LPF_ALL_TGT)) {
 
        if (flags & (LNTF_CHECK_LINKEA | LNTF_CHECK_PARENT) &&
            !(lfsck->li_bookmark_ram.lb_param & LPF_ALL_TGT)) {

-               CDEBUG(D_LFSCK, "%s: some MDT(s) maybe NOT take part in the"
-                      "the namespace LFSCK, then the LFSCK cannot guarantee"
-                      "all the name entries have been verified in first-stage"
-                      "scanning. So have to skip orphan related handling for"
-                      "the directory object "DFID" with remote name entry\n",
+               CDEBUG(D_LFSCK,
+                      "%s: some MDT(s) maybe NOT take part in the the namespace LFSCK, then the LFSCK cannot guarantee all the name entries have been verified in first-stage scanning. So have to skip orphan related handling for the directory object "DFID" with remote name entry\n",

                       lfsck_lfsck2name(lfsck), PFID(cfid));
 
                RETURN(0);
                       lfsck_lfsck2name(lfsck), PFID(cfid));
 
                RETURN(0);

diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c
index d1f114e..0f1dfe3 100644 (file)
--- a/lustre/llite/statahead.c
+++ b/lustre/llite/statahead.c
@@ -1303,8 +1303,7 @@ static int is_first_dirent(struct inode *dir, struct dentry *dentry)
                        struct ll_inode_info *lli = ll_i2info(dir);
 
                        rc = PTR_ERR(page);
                        struct ll_inode_info *lli = ll_i2info(dir);
 
                        rc = PTR_ERR(page);

-                       CERROR("%s: reading dir "DFID" at %llu"
-                              "opendir_pid = %u : rc = %d\n",
+                       CERROR("%s: reading dir "DFID" at %llu opendir_pid = %u : rc = %d\n",

                               ll_i2sbi(dir)->ll_fsname,
                               PFID(ll_inode2fid(dir)), pos,
                               lli->lli_opendir_pid, rc);
                               ll_i2sbi(dir)->ll_fsname,
                               PFID(ll_inode2fid(dir)), pos,
                               lli->lli_opendir_pid, rc);

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 5d660b1..17ded38 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -100,8 +100,8 @@ static int ll_readlink_internal(struct inode *inode,
        *symname = req_capsule_server_get(&(*request)->rq_pill, &RMF_MDT_MD);
        if (!*symname || strnlen(*symname, symlen) != symlen - 1) {
                /* not full/NULL terminated */
        *symname = req_capsule_server_get(&(*request)->rq_pill, &RMF_MDT_MD);
        if (!*symname || strnlen(*symname, symlen) != symlen - 1) {
                /* not full/NULL terminated */

-               CERROR("%s: inode "DFID": symlink not NULL terminated string"
-                      "of length %d\n", sbi->ll_fsname,
+               CERROR("%s: inode "DFID": symlink not NULL terminated string of length %d\n",
+                      sbi->ll_fsname,

                       PFID(ll_inode2fid(inode)), symlen - 1);
                GOTO(failed, rc = -EPROTO);
        }
                       PFID(ll_inode2fid(inode)), symlen - 1);
                GOTO(failed, rc = -EPROTO);
        }

diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 29af1ed..21eae5d 100644 (file)
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -1218,8 +1218,9 @@ int mdd_attr_set(const struct lu_env *env, struct md_object *obj,
 
        /* no need to setattr anymore */
        if (la_copy->la_valid == 0) {
 
        /* no need to setattr anymore */
        if (la_copy->la_valid == 0) {

-               CDEBUG(D_INODE, "%s: no valid attribute on "DFID", previous"
-                      "valid is %#llx\n", mdd2obd_dev(mdd)->obd_name,
+               CDEBUG(D_INODE,
+                      "%s: no valid attribute on "DFID", previous valid is %#llx\n",
+                      mdd2obd_dev(mdd)->obd_name,

                       PFID(mdo2fid(mdd_obj)), la->la_valid);
 
                RETURN(0);
                       PFID(mdo2fid(mdd_obj)), la->la_valid);
 
                RETURN(0);

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index e2397cf..2cc8151 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -3378,8 +3378,9 @@ mdt_object_lock_internal(struct mdt_thread_info *info, struct mdt_object *o,
                 * object anyway XXX*/
                if (lh->mlh_type == MDT_PDO_LOCK &&
                    lh->mlh_pdo_hash != 0) {
                 * object anyway XXX*/
                if (lh->mlh_type == MDT_PDO_LOCK &&
                    lh->mlh_pdo_hash != 0) {

-                       CDEBUG(D_INFO, "%s: "DFID" convert PDO lock to"
-                              "EX lock.\n", mdt_obd_name(info->mti_mdt),
+                       CDEBUG(D_INFO,
+                              "%s: "DFID" convert PDO lock to EX lock.\n",
+                              mdt_obd_name(info->mti_mdt),

                               PFID(mdt_object_fid(o)));
                        lh->mlh_pdo_hash = 0;
                        lh->mlh_rreg_mode = LCK_EX;
                               PFID(mdt_object_fid(o)));
                        lh->mlh_pdo_hash = 0;
                        lh->mlh_rreg_mode = LCK_EX;

diff --git a/lustre/mdt/mdt_mds.c b/lustre/mdt/mdt_mds.c
index 5699c40..86a6e41 100644 (file)
--- a/lustre/mdt/mdt_mds.c
+++ b/lustre/mdt/mdt_mds.c
@@ -503,8 +503,8 @@ static int mds_start_ptlrpc_service(struct mds_device *m)
 
                        rc = cfs_cpt_set_node(mdt_io_cptable, cpt++, i);
                        if (!rc) {
 
                        rc = cfs_cpt_set_node(mdt_io_cptable, cpt++, i);
                        if (!rc) {

-                               CWARN("MDS Failed to set node %d for"
-                                     "IO CPT table\n", i);
+                               CWARN("MDS Failed to set node %d for IO CPT table\n",
+                                     i);

                                cfs_cpt_table_free(mdt_io_cptable);
                                mdt_io_cptable = NULL;
                                break;
                                cfs_cpt_table_free(mdt_io_cptable);
                                mdt_io_cptable = NULL;
                                break;

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index a670b07..6487d72 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -328,25 +328,23 @@ static int mgs_check_target(const struct lu_env *env,
 /* Ensure this is not a failover node that is connecting first*/
 static int mgs_check_failover_reg(struct mgs_target_info *mti)
 {
 /* Ensure this is not a failover node that is connecting first*/
 static int mgs_check_failover_reg(struct mgs_target_info *mti)
 {

-        lnet_nid_t nid;
-        char *ptr;
-        int i;
+       lnet_nid_t nid;
+       char *ptr;
+       int i;

 
 

-        ptr = mti->mti_params;
-        while (class_find_param(ptr, PARAM_FAILNODE, &ptr) == 0) {
+       ptr = mti->mti_params;
+       while (class_find_param(ptr, PARAM_FAILNODE, &ptr) == 0) {

                while (class_parse_nid_quiet(ptr, &nid, &ptr) == 0) {
                while (class_parse_nid_quiet(ptr, &nid, &ptr) == 0) {

-                        for (i = 0; i < mti->mti_nid_count; i++) {
-                                if (nid == mti->mti_nids[i]) {
-                                        LCONSOLE_WARN("Denying initial registra"
-                                                      "tion attempt from nid %s"
-                                                      ", specified as failover"
-                                                      "\n",libcfs_nid2str(nid));
-                                        return -EADDRNOTAVAIL;
-                                }
-                        }
-                }
-        }
-        return 0;
+                       for (i = 0; i < mti->mti_nid_count; i++) {
+                               if (nid == mti->mti_nids[i]) {
+                                       LCONSOLE_WARN("Denying initial registration attempt from nid %s, specified as failover\n",
+                                                     libcfs_nid2str(nid));
+                                       return -EADDRNOTAVAIL;
+                               }
+                       }
+               }
+       }
+       return 0;

 }
 
 /* Called whenever a target starts up.  Flags indicate first connect, etc. */
 }
 
 /* Called whenever a target starts up.  Flags indicate first connect, etc. */

diff --git a/lustre/mgs/mgs_llog.c b/lustre/mgs/mgs_llog.c
index 6b8c0e4..08c2a37 100644 (file)
--- a/lustre/mgs/mgs_llog.c
+++ b/lustre/mgs/mgs_llog.c
@@ -3912,16 +3912,16 @@ static int mgs_write_log_param(const struct lu_env *env,
        if (class_match_param(ptr, PARAM_NETWORK, NULL) == 0)
                GOTO(end, rc);
 
        if (class_match_param(ptr, PARAM_NETWORK, NULL) == 0)
                GOTO(end, rc);
 

-        /* Processed in mgs_write_log_ost */
-        if (class_match_param(ptr, PARAM_FAILMODE, NULL) == 0) {
-                if (mti->mti_flags & LDD_F_PARAM) {
-                        LCONSOLE_ERROR_MSG(0x169, "%s can only be "
-                                           "changed with tunefs.lustre"
-                                           "and --writeconf\n", ptr);
-                        rc = -EPERM;
-                }
-                GOTO(end, rc);
-        }
+       /* Processed in mgs_write_log_ost */
+       if (class_match_param(ptr, PARAM_FAILMODE, NULL) == 0) {
+               if (mti->mti_flags & LDD_F_PARAM) {
+                       LCONSOLE_ERROR_MSG(0x169,
+                                          "%s can only be changed with tunefs.lustre and --writeconf\n",
+                                          ptr);
+                       rc = -EPERM;
+               }
+               GOTO(end, rc);
+       }

 
         if (class_match_param(ptr, PARAM_SRPC, NULL) == 0) {
                rc = mgs_srpc_set_param(env, mgs, fsdb, mti, ptr);
 
         if (class_match_param(ptr, PARAM_SRPC, NULL) == 0) {
                rc = mgs_srpc_set_param(env, mgs, fsdb, mti, ptr);


@@ -4004,18 +4004,12 @@ static int mgs_write_log_param(const struct lu_env *env,
                }
 active_err:
                if (rc < 0) {
                }
 active_err:
                if (rc < 0) {

-                       LCONSOLE_ERROR_MSG(0x145, "Couldn't find %s in"
-                                          "log (%d). No permanent "
-                                          "changes were made to the "
-                                          "config log.\n",
+                       LCONSOLE_ERROR_MSG(0x145,
+                                          "Couldn't find %s in log (%d). No permanent changes were made to the config log.\n",

                                           mti->mti_svname, rc);
                        if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags))
                                           mti->mti_svname, rc);
                        if (test_bit(FSDB_OLDLOG14, &fsdb->fsdb_flags))

-                               LCONSOLE_ERROR_MSG(0x146, "This may be"
-                                                  " because the log"
-                                                  "is in the old 1.4"
-                                                  "style. Consider "
-                                                  " --writeconf to "
-                                                  "update the logs.\n");
+                               LCONSOLE_ERROR_MSG(0x146,
+                                                  "This may be because the log is in the old 1.4 style. Consider --writeconf to update the logs.\n");

                        GOTO(end, rc);
                }
                /* Fall through to osc/mdc proc for deactivating live
                        GOTO(end, rc);
                }
                /* Fall through to osc/mdc proc for deactivating live

diff --git a/lustre/obdclass/genops.c b/lustre/obdclass/genops.c
index 14ab1ed..f13069e 100644 (file)
--- a/lustre/obdclass/genops.c
+++ b/lustre/obdclass/genops.c
@@ -2279,8 +2279,8 @@ __u16 obd_get_mod_rpc_slot(struct client_obd *cli, __u32 opc)
                        spin_unlock(&cli->cl_mod_rpcs_lock);
                        /* tag 0 is reserved for non-modify RPCs */
 
                        spin_unlock(&cli->cl_mod_rpcs_lock);
                        /* tag 0 is reserved for non-modify RPCs */
 

-                       CDEBUG(D_RPCTRACE, "%s: modify RPC slot %u is allocated"
-                              "opc %u, max %hu\n",
+                       CDEBUG(D_RPCTRACE,
+                              "%s: modify RPC slot %u is allocated opc %u, max %hu\n",

                               cli->cl_import->imp_obd->obd_name,
                               i + 1, opc, max);
 
                               cli->cl_import->imp_obd->obd_name,
                               i + 1, opc, max);
 

diff --git a/lustre/obdclass/llog_osd.c b/lustre/obdclass/llog_osd.c
index 54f3dd4..798451f 100644 (file)
--- a/lustre/obdclass/llog_osd.c
+++ b/lustre/obdclass/llog_osd.c
@@ -977,9 +977,7 @@ static int llog_osd_next_block(const struct lu_env *env,
                        lustre_swab_llog_rec(last_rec);
 
                if (last_rec->lrh_index != tail->lrt_index) {
                        lustre_swab_llog_rec(last_rec);
 
                if (last_rec->lrh_index != tail->lrt_index) {

-                       CERROR("%s: invalid llog tail at log id "DFID":%x "
-                              "offset %llu last_rec idx %u tail idx %u"
-                              "lrt len %u read_size %d\n",
+                       CERROR("%s: invalid llog tail at log id "DFID":%x offset %llu last_rec idx %u tail idx %u lrt len %u read_size %d\n",

                               o->do_lu.lo_dev->ld_obd->obd_name,
                               PFID(&loghandle->lgh_id.lgl_oi.oi_fid),
                               loghandle->lgh_id.lgl_ogen, *cur_offset,
                               o->do_lu.lo_dev->ld_obd->obd_name,
                               PFID(&loghandle->lgh_id.lgl_oi.oi_fid),
                               loghandle->lgh_id.lgl_ogen, *cur_offset,

diff --git a/lustre/obdclass/llog_test.c b/lustre/obdclass/llog_test.c
index 77c65af..ac66301 100644 (file)
--- a/lustre/obdclass/llog_test.c
+++ b/lustre/obdclass/llog_test.c
@@ -1059,8 +1059,7 @@ static int llog_test_7_sub(const struct lu_env *env, struct llog_ctxt *ctxt)
                GOTO(out_close, rc);
        }
        if (process_count != plain_counter) {
                GOTO(out_close, rc);
        }
        if (process_count != plain_counter) {

-               CERROR("7_sub: Reverse/direct processing found different"
-                      "number of records: %d/%d\n",
+               CERROR("7_sub: Reverse/direct processing found different number of records: %d/%d\n",

                       plain_counter, process_count);
                GOTO(out_close, rc = -EINVAL);
        }
                       plain_counter, process_count);
                GOTO(out_close, rc = -EINVAL);
        }

diff --git a/lustre/ofd/ofd_io.c b/lustre/ofd/ofd_io.c
index 27f379d..5c78d0c 100644 (file)
--- a/lustre/ofd/ofd_io.c
+++ b/lustre/ofd/ofd_io.c
@@ -782,8 +782,7 @@ int ofd_preprw(const struct lu_env *env, int cmd, struct obd_export *exp,
        int                      rc = 0;
 
        if (*nr_local > PTLRPC_MAX_BRW_PAGES) {
        int                      rc = 0;
 
        if (*nr_local > PTLRPC_MAX_BRW_PAGES) {

-               CERROR("%s: bulk has too many pages %d, which exceeds the"
-                      "maximum pages per RPC of %d\n",
+               CERROR("%s: bulk has too many pages %d, which exceeds the maximum pages per RPC of %d\n",

                       exp->exp_obd->obd_name, *nr_local, PTLRPC_MAX_BRW_PAGES);
                RETURN(-EPROTO);
        }
                       exp->exp_obd->obd_name, *nr_local, PTLRPC_MAX_BRW_PAGES);
                RETURN(-EPROTO);
        }

diff --git a/lustre/osd-zfs/osd_scrub.c b/lustre/osd-zfs/osd_scrub.c
index 97cfb2d..67610d6 100644 (file)
--- a/lustre/osd-zfs/osd_scrub.c
+++ b/lustre/osd-zfs/osd_scrub.c
@@ -1268,8 +1268,7 @@ static int osd_ios_ROOT_sd(const struct lu_env *env, struct osd_device *dev,
                                    sizeof(*zde) / 8, (void *)zde);
                if (rc) {
                        if (rc != -ENOENT)
                                    sizeof(*zde) / 8, (void *)zde);
                if (rc) {
                        if (rc != -ENOENT)

-                               CWARN("%s: initial OI scrub failed to find"
-                                     "the entry %s under .lustre: rc = %d\n",
+                               CWARN("%s: initial OI scrub failed to find the entry %s under .lustre: rc = %d\n",

                                      osd_name(dev), map->olm_name, rc);
                        else if (!fid_is_zero(&map->olm_fid))
                                /* Try to remove the stale OI mapping. */
                                      osd_name(dev), map->olm_name, rc);
                        else if (!fid_is_zero(&map->olm_fid))
                                /* Try to remove the stale OI mapping. */

diff --git a/lustre/ost/ost_handler.c b/lustre/ost/ost_handler.c
index 831f44d..68ece80 100644 (file)
--- a/lustre/ost/ost_handler.c
+++ b/lustre/ost/ost_handler.c
@@ -188,8 +188,8 @@ static int ost_setup(struct obd_device *obd, struct lustre_cfg* lcfg)
 
                        rc = cfs_cpt_set_node(ost_io_cptable, cpt++, i);
                        if (!rc) {
 
                        rc = cfs_cpt_set_node(ost_io_cptable, cpt++, i);
                        if (!rc) {

-                               CWARN("OSS Failed to set node %d for"
-                                     "IO CPT table\n", i);
+                               CWARN("OSS Failed to set node %d for IO CPT table\n",
+                                     i);

                                cfs_cpt_table_free(ost_io_cptable);
                                ost_io_cptable = NULL;
                                break;
                                cfs_cpt_table_free(ost_io_cptable);
                                ost_io_cptable = NULL;
                                break;

diff --git a/lustre/quota/qmt_pool.c b/lustre/quota/qmt_pool.c
index 87ce912..c6ef6fc 100644 (file)
--- a/lustre/quota/qmt_pool.c
+++ b/lustre/quota/qmt_pool.c
@@ -531,8 +531,7 @@ int qmt_pool_prepare(const struct lu_env *env, struct qmt_device *qmt,
                                                0444, &lprocfs_quota_seq_fops,
                                                obj);
                        if (rc)
                                                0444, &lprocfs_quota_seq_fops,
                                                obj);
                        if (rc)

-                               CWARN("%s: Error adding procfs file for global"
-                                     "quota index "DFID", rc:%d\n",
+                               CWARN("%s: Error adding procfs file for global quota index "DFID": rc = %d\n",

                                      qmt->qmt_svname, PFID(&qti->qti_fid), rc);
 #endif
                }
                                      qmt->qmt_svname, PFID(&qti->qti_fid), rc);
 #endif
                }

diff --git a/lustre/target/tgt_lastrcvd.c b/lustre/target/tgt_lastrcvd.c
index dbce02f..c11cef4 100644 (file)
--- a/lustre/target/tgt_lastrcvd.c
+++ b/lustre/target/tgt_lastrcvd.c
@@ -1740,10 +1740,9 @@ int tgt_server_data_init(const struct lu_env *env, struct lu_target *tgt)
                }
 
                if (lsd->lsd_osd_index != index) {
                }
 
                if (lsd->lsd_osd_index != index) {

-                       LCONSOLE_ERROR_MSG(0x157, "%s: index %d in last rcvd "
-                                          "is different with the index %d in"
-                                          "config log, It might be disk"
-                                          "corruption!\n", tgt_name(tgt),
+                       LCONSOLE_ERROR_MSG(0x157,
+                                          "%s: index %d in last rcvd is different with the index %d in config log, It might be disk corruption!\n",
+                                          tgt_name(tgt),

                                           lsd->lsd_osd_index, index);
                        RETURN(-EINVAL);
                }
                                           lsd->lsd_osd_index, index);
                        RETURN(-EINVAL);
                }

diff --git a/lustre/tests/listxattr_size_check.c b/lustre/tests/listxattr_size_check.c
index 5adf144..5124a3a 100644 (file)
--- a/lustre/tests/listxattr_size_check.c
+++ b/lustre/tests/listxattr_size_check.c
@@ -63,8 +63,9 @@ int main(int argc, char *argv[])
 
        /* LU-3403 llite: error of listxattr when buffer is small */
        if (ret_null < 2) {
 
        /* LU-3403 llite: error of listxattr when buffer is small */
        if (ret_null < 2) {

-               fprintf(stderr, "listxattr(%s, NULL, 0) returned"
-                                       "a sizes less than 2", path);
+               fprintf(stderr,
+                       "listxattr(%s, NULL, 0) returned a sizes less than 2",
+                       path);

                ret = EINVAL;
                goto out;
        }
                ret = EINVAL;
                goto out;
        }

diff --git a/lustre/utils/gss/krb5_util.c b/lustre/utils/gss/krb5_util.c
index 42b4914..f3e99f9 100644 (file)
--- a/lustre/utils/gss/krb5_util.c
+++ b/lustre/utils/gss/krb5_util.c
@@ -595,9 +595,8 @@ gssd_process_krb5_keytab(krb5_context context, krb5_keytab kt, char *kt_name)
                        ple = gssd_get_realm_ple((void *)&kte.principal->realm);
                        if (ple) {
                                if (ple->fl_mds) {
                        ple = gssd_get_realm_ple((void *)&kte.principal->realm);
                        if (ple) {
                                if (ple->fl_mds) {

-                                       printerr(2,"mds service entry: found a"
-                                                "duplicated one, it's like a "
-                                                "mis-configuration, skip\n");
+                                       printerr(2,
+                                                "mds service entry: found a duplicated one, it's like a mis-configuration, skip\n");

                                        goto next;
                                }
 
                                        goto next;
                                }
 

diff --git a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
index 5f95668..366d2d2 100644 (file)
--- a/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
+++ b/lustre/utils/gss/nfs-utils-1.0.10-lustre.diff
@@ -2205,7 +2205,7 @@ diff -rNup nfs-utils-1.0.10/utils/gssd/krb5_util.c nfs-utils-1.0.10.lustre/utils
 +                      ple = gssd_get_realm_ple((void *)&kte.principal->realm);
 +                      if (ple) {
 +                              if (ple->fl_mds) {
 +                      ple = gssd_get_realm_ple((void *)&kte.principal->realm);
 +                      if (ple) {
 +                              if (ple->fl_mds) {

-+                                      printerr(2,"mds service entry: found a"
++                                      printerr(2,"mds service entry: found a "

 +                                               "duplicated one, it's like a "
 +                                               "mis-configuration, skip\n");
 +                                      goto next;
 +                                               "duplicated one, it's like a "
 +                                               "mis-configuration, skip\n");
 +                                      goto next;

diff --git a/lustre/utils/gss/nfs-utils-1.0.11-lustre.diff b/lustre/utils/gss/nfs-utils-1.0.11-lustre.diff
index e0f551b..cf3a40c 100644 (file)
--- a/lustre/utils/gss/nfs-utils-1.0.11-lustre.diff
+++ b/lustre/utils/gss/nfs-utils-1.0.11-lustre.diff
@@ -2295,7 +2295,7 @@ diff -Nrup nfs-utils-1.0.11.lustre/utils/gssd/krb5_util.c nfs-utils-1.0.11/utils
 +                      ple = gssd_get_realm_ple((void *)&kte.principal->realm);
 +                      if (ple) {
 +                              if (ple->fl_mds) {
 +                      ple = gssd_get_realm_ple((void *)&kte.principal->realm);
 +                      if (ple) {
 +                              if (ple->fl_mds) {

-+                                      printerr(2,"mds service entry: found a"
++                                      printerr(2,"mds service entry: found a "

 +                                               "duplicated one, it's like a "
 +                                               "mis-configuration, skip\n");
 +                                      goto next;
 +                                               "duplicated one, it's like a "
 +                                               "mis-configuration, skip\n");
 +                                      goto next;

diff --git a/lustre/utils/gss/svcgssd_proc.c b/lustre/utils/gss/svcgssd_proc.c
index 72d371b..f2e94fc 100644 (file)
--- a/lustre/utils/gss/svcgssd_proc.c
+++ b/lustre/utils/gss/svcgssd_proc.c
@@ -836,8 +836,9 @@ int handle_channel_request(FILE *f)
        else if (lustre_mech == LGSS_MECH_NULL)
                rc = handle_null(&snd);
        else
        else if (lustre_mech == LGSS_MECH_NULL)
                rc = handle_null(&snd);
        else

-               printerr(0, "WARNING: Received or request for"
-                        "subflavor that is not enabled: %d\n", lustre_mech);
+               printerr(0,
+                        "WARNING: Received or request for subflavor that is not enabled: %d\n",
+                        lustre_mech);

 
 out_err:
        /* Failures send a null token */
 
 out_err:
        /* Failures send a null token */

diff --git a/lustre/utils/lctl.c b/lustre/utils/lctl.c
index 4fb7071..bbf262c 100644 (file)
--- a/lustre/utils/lctl.c
+++ b/lustre/utils/lctl.c
@@ -114,13 +114,13 @@ command_t cmdlist[] = {
        {"===== network config =====", NULL, 0, "network config"},
        {"--net", jt_opt_net, 0, "run <command> after selecting network <net>\n"
         "usage: --net <tcp/o2ib/...> <command>"},
        {"===== network config =====", NULL, 0, "network config"},
        {"--net", jt_opt_net, 0, "run <command> after selecting network <net>\n"
         "usage: --net <tcp/o2ib/...> <command>"},

-       {"network", jt_ptl_network, 0, "configure LNET"
+       {"network", jt_ptl_network, 0, "configure LNET\n"

         "usage: network up|down"},
         "usage: network up|down"},

-       {"net", jt_ptl_network, 0, "configure LNET"
+       {"net", jt_ptl_network, 0, "configure LNET\n"

         "usage: net up|down"},
         "usage: net up|down"},

-       {"list_nids", jt_ptl_list_nids, 0, "list local NIDs"
+       {"list_nids", jt_ptl_list_nids, 0, "list local NIDs\n"

         "usage: list_nids [all]"},
         "usage: list_nids [all]"},

-       {"which_nid", jt_ptl_which_nid, 0, "choose a NID"
+       {"which_nid", jt_ptl_which_nid, 0, "choose a NID\n"

         "usage: which_nid NID [NID...]"},
        {"replace_nids", jt_replace_nids, 0,
         "replace primary NIDs for a device\n"
         "usage: which_nid NID [NID...]"},
        {"replace_nids", jt_replace_nids, 0,
         "replace primary NIDs for a device\n"


@@ -351,7 +351,7 @@ command_t cmdlist[] = {
         "add a range to a nodemap\n"
         "usage: nodemap_del_range <nid_range>"},
        {"nodemap_modify", jt_nodemap_modify, 0,
         "add a range to a nodemap\n"
         "usage: nodemap_del_range <nid_range>"},
        {"nodemap_modify", jt_nodemap_modify, 0,

-        "modify a nodemap parameters"
+        "modify a nodemap parameters\n"

         "usage: nodemap_modify nodemap_name param value"},
        {"nodemap_add_idmap", jt_nodemap_add_idmap, 0,
         "add a UID or GID mapping to a nodemap"},
         "usage: nodemap_modify nodemap_name param value"},
        {"nodemap_add_idmap", jt_nodemap_add_idmap, 0,
         "add a UID or GID mapping to a nodemap"},

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index 5dbe904..4f933b4 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -288,8 +288,7 @@ repeat:
                                opt.o_archive_id_cnt = 0;
                                opt.o_archive_id_used = 0;
                                all_id = true;
                                opt.o_archive_id_cnt = 0;
                                opt.o_archive_id_used = 0;
                                all_id = true;

-                               CT_WARN("archive-id = 0 is found, any backend"
-                                       "will be served\n");
+                               CT_WARN("archive-id = 0 is found, any backend will be served\n");

                                goto repeat;
                        }
 
                                goto repeat;
                        }
 

diff --git a/lustre/utils/libmount_utils_ldiskfs.c b/lustre/utils/libmount_utils_ldiskfs.c
index 9586396..1ee3612 100644 (file)
--- a/lustre/utils/libmount_utils_ldiskfs.c
+++ b/lustre/utils/libmount_utils_ldiskfs.c
@@ -356,9 +356,9 @@ static void disp_old_e2fsprogs_msg(const char *feature, int make_backfs)
                "to enable this feature.\n");
 #endif
        if (make_backfs)
                "to enable this feature.\n");
 #endif
        if (make_backfs)

-               fprintf(stderr, "Feature will not be enabled until %s"
-                       "is updated and '%s -O %s %%{device}' "
-                       "is run.\n\n", E2FSPROGS, TUNE2FS, feature);
+               fprintf(stderr,
+                       "Feature will not be enabled until %s is updated and '%s -O %s %%{device}' is run.\n\n",
+                       E2FSPROGS, TUNE2FS, feature);

 }
 
 /* Check whether the file exists in the device */
 }
 
 /* Check whether the file exists in the device */

diff --git a/lustre/utils/llverdev.c b/lustre/utils/llverdev.c
index 54e3499..18f7eb5 100644 (file)
--- a/lustre/utils/llverdev.c
+++ b/lustre/utils/llverdev.c
@@ -492,8 +492,8 @@ int main(int argc, char **argv)
                case 'c':
                        chunksize = (strtoul(optarg, NULL, 0) * ONE_MB);
                        if (!chunksize) {
                case 'c':
                        chunksize = (strtoul(optarg, NULL, 0) * ONE_MB);
                        if (!chunksize) {

-                               fprintf(stderr, "%s: chunk size value should be"
-                                       "nonzero and multiple of 1MB\n",
+                               fprintf(stderr,
+                                       "%s: chunk size value should be nonzero and multiple of 1MB\n",

                                        progname);
                                return -1;
                        }
                                        progname);
                                return -1;
                        }

diff --git a/lustre/utils/llverfs.c b/lustre/utils/llverfs.c
index 5e328e1..a32954f 100644 (file)
--- a/lustre/utils/llverfs.c
+++ b/lustre/utils/llverfs.c
@@ -810,8 +810,8 @@ int main(int argc, char **argv)
                ext2_filsys fs;
 
                if ((fp = setmntent("/etc/mtab", "r")) == NULL) {
                ext2_filsys fs;
 
                if ((fp = setmntent("/etc/mtab", "r")) == NULL) {

-                       fprintf(stderr, "%s: fail to open /etc/mtab in read"
-                               "mode :%s\n", progname, strerror(errno));
+                       fprintf(stderr, "%s: fail to open /etc/mtab in read mode :%s\n",
+                               progname, strerror(errno));

                        goto guess;
                }
 
                        goto guess;
                }
 

diff --git a/lustre/utils/obd.c b/lustre/utils/obd.c
index 1e34654..db5bc12 100644 (file)
--- a/lustre/utils/obd.c
+++ b/lustre/utils/obd.c
@@ -1247,8 +1247,7 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
         }
 
         if (stripe_count == 0 && stripe_index != -1) {
         }
 
         if (stripe_count == 0 && stripe_index != -1) {

-                fprintf(stderr, "If stripe_count is 0, stripe_index can not"
-                                "be specified\n");
+                fprintf(stderr, "If stripe_count is 0, stripe_index can not be specified\n");

                 return CMD_HELP;
         }
 
                 return CMD_HELP;
         }
 


@@ -1282,8 +1281,8 @@ int jt_obd_md_common(int argc, char **argv, int cmd)
         if (parent_basedir == NULL) {
                 char *last_lash;
                 if (name == NULL) {
         if (parent_basedir == NULL) {
                 char *last_lash;
                 if (name == NULL) {

-                        fprintf(stderr, "parent_basedir or name must be"
-                                        "indicated!\n");
+                        fprintf(stderr,
+                                "parent_basedir or name must be indicated!\n");

                         return CMD_HELP;
                 }
                 /*Get directory and name from name*/
                         return CMD_HELP;
                 }
                 /*Get directory and name from name*/