staging: lustre: Coalesce string fragments

[deliverable/linux.git] / drivers / staging / lustre / lustre / ptlrpc / layout.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/layout.c b/drivers/staging/lustre/lustre/ptlrpc/layout.c
index 78364ec4fbf02050276846687c402b58eb16849d..252f3e13d04a6e66e55ac5133da0bdb325ce2d7e 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/layout.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/layout.c
@@ -1886,8 +1886,8 @@ swabber_dumper_helper(struct req_capsule *pill,
                swabber(value);
                ptlrpc_buf_set_swabbed(pill->rc_req, inout, offset);
                if (dump) {
-                       CDEBUG(D_RPCTRACE, "Dump of swabbed field %s "
-                              "follows\n", field->rmf_name);
+                       CDEBUG(D_RPCTRACE, "Dump of swabbed field %s follows\n",
+                              field->rmf_name);
                        field->rmf_dumper(value);
                }
 
@@ -1903,8 +1903,7 @@ swabber_dumper_helper(struct req_capsule *pill,
             i < n;
             i++, p += field->rmf_size) {
                if (dump) {
-                       CDEBUG(D_RPCTRACE, "Dump of %sarray field %s, "
-                              "element %d follows\n",
+                       CDEBUG(D_RPCTRACE, "Dump of %sarray field %s, element %d follows\n",
                               do_swab ? "unswabbed " : "", field->rmf_name, i);
                        field->rmf_dumper(p);
                }
@@ -1912,8 +1911,8 @@ swabber_dumper_helper(struct req_capsule *pill,
                        continue;
                swabber(p);
                if (dump) {
-                       CDEBUG(D_RPCTRACE, "Dump of swabbed array field %s, "
-                              "element %d follows\n", field->rmf_name, i);
+                       CDEBUG(D_RPCTRACE, "Dump of swabbed array field %s, element %d follows\n",
+                              field->rmf_name, i);
                        field->rmf_dumper(value);
                }
        }
@@ -1972,8 +1971,7 @@ static void *__req_capsule_get(struct req_capsule *pill,
                 */
                len = lustre_msg_buflen(msg, offset);
                if ((len % field->rmf_size) != 0) {
-                       CERROR("%s: array field size mismatch "
-                              "%d modulo %d != 0 (%d)\n",
+                       CERROR("%s: array field size mismatch %d modulo %d != 0 (%d)\n",
                               field->rmf_name, len, field->rmf_size, loc);
                        return NULL;
                }
@@ -1986,8 +1984,7 @@ static void *__req_capsule_get(struct req_capsule *pill,
 
        if (value == NULL) {
                DEBUG_REQ(D_ERROR, pill->rc_req,
-                         "Wrong buffer for field `%s' (%d of %d) "
-                         "in format `%s': %d vs. %d (%s)\n",
+                         "Wrong buffer for field `%s' (%d of %d) in format `%s': %d vs. %d (%s)\n",
                          field->rmf_name, offset, lustre_msg_bufcount(msg),
                          fmt->rf_name, lustre_msg_buflen(msg, offset), len,
                          rcl_names[loc]);
@@ -2020,8 +2017,8 @@ 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 %d\n", field->rmf_name, len);
+                       CDEBUG(D_RPCTRACE, "Field %s has no dumper function; field size is %d\n",
+                              field->rmf_name, len);
                } else {
                        /* It's the dumping side-effect that we're interested in */
                        (void) __req_capsule_get(pill, field, loc, NULL, 1);
@@ -2173,8 +2170,7 @@ void req_capsule_set_size(struct req_capsule *pill,
            (size > 0)) {
                if ((field->rmf_flags & RMF_F_STRUCT_ARRAY) &&
                    (size % field->rmf_size != 0)) {
-                       CERROR("%s: array field size mismatch "
-                              "%d %% %d != 0 (%d)\n",
+                       CERROR("%s: array field size mismatch %d %% %d != 0 (%d)\n",
                               field->rmf_name, size, field->rmf_size, loc);
                        LBUG();
                } else if (!(field->rmf_flags & RMF_F_STRUCT_ARRAY) &&