staging: lustre: Coalesce string fragments

[deliverable/linux.git] / drivers / staging / lustre / lustre / libcfs / linux / linux-cpu.c

diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
index 224c65b5ce4ee3ef30dc4f0aa0b3c37c96cd56cd..05f7595f18aa55f51ba8c86c3aec2b4d572a48de 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
@@ -333,8 +333,8 @@ cfs_cpt_unset_cpu(struct cfs_cpt_table *cptab, int cpt, int cpu)
                /* caller doesn't know the partition ID */
                cpt = cptab->ctb_cpu2cpt[cpu];
                if (cpt < 0) { /* not set in this CPT-table */
-                       CDEBUG(D_INFO, "Try to unset cpu %d which is "
-                                      "not in CPT-table %p\n", cpt, cptab);
+                       CDEBUG(D_INFO, "Try to unset cpu %d which is not in CPT-table %p\n",
+                              cpt, cptab);
                        return;
                }
 
@@ -384,8 +384,8 @@ cfs_cpt_set_cpumask(struct cfs_cpt_table *cptab, int cpt, cpumask_t *mask)
        int     i;
 
        if (cpus_weight(*mask) == 0 || any_online_cpu(*mask) == NR_CPUS) {
-               CDEBUG(D_INFO, "No online CPU is found in the CPU mask "
-                              "for CPU partition %d\n", cpt);
+               CDEBUG(D_INFO, "No online CPU is found in the CPU mask for CPU partition %d\n",
+                      cpt);
                return 0;
        }
 
@@ -579,9 +579,8 @@ cfs_cpt_bind(struct cfs_cpt_table *cptab, int cpt)
        }
 
        if (any_online_cpu(*cpumask) == NR_CPUS) {
-               CERROR("No online CPU found in CPU partition %d, did someone "
-                      "do CPU hotplug on system? You might need to reload "
-                      "Lustre modules to keep system working well.\n", cpt);
+               CERROR("No online CPU found in CPU partition %d, did someone do CPU hotplug on system? You might need to reload Lustre modules to keep system working well.\n",
+                      cpt);
                return -EINVAL;
        }
 
@@ -737,16 +736,12 @@ cfs_cpt_table_create(int ncpt)
                ncpt = rc;
 
        if (ncpt > num_online_cpus() || ncpt > 4 * rc) {
-               CWARN("CPU partition number %d is larger than suggested "
-                     "value (%d), your system may have performance"
-                     "issue or run out of memory while under pressure\n",
+               CWARN("CPU partition number %d is larger than suggested value (%d), your system may have performance issue or run out of memory while under pressure\n",
                      ncpt, rc);
        }
 
        if (num_online_cpus() % ncpt != 0) {
-               CERROR("CPU number %d is not multiple of cpu_npartition %d, "
-                      "please try different cpu_npartitions value or"
-                      "set pattern string by cpu_pattern=STRING\n",
+               CERROR("CPU number %d is not multiple of cpu_npartition %d, please try different cpu_npartitions value or set pattern string by cpu_pattern=STRING\n",
                       (int)num_online_cpus(), ncpt);
                goto failed;
        }
@@ -796,8 +791,7 @@ cfs_cpt_table_create(int ncpt)
 
        if (cpt != ncpt ||
            num != cpus_weight(*cptab->ctb_parts[ncpt - 1].cpt_cpumask)) {
-               CERROR("Expect %d(%d) CPU partitions but got %d(%d), "
-                      "CPU hotplug/unplug while setting?\n",
+               CERROR("Expect %d(%d) CPU partitions but got %d(%d), CPU hotplug/unplug while setting?\n",
                       cptab->ctb_nparts, num, cpt,
                       cpus_weight(*cptab->ctb_parts[ncpt - 1].cpt_cpumask));
                goto failed;
@@ -808,8 +802,7 @@ cfs_cpt_table_create(int ncpt)
        return cptab;
 
  failed:
-       CERROR("Failed to setup CPU-partition-table with %d "
-              "CPU-partitions, online HW nodes: %d, HW cpus: %d.\n",
+       CERROR("Failed to setup CPU-partition-table with %d CPU-partitions, online HW nodes: %d, HW cpus: %d.\n",
               ncpt, num_online_nodes(), num_online_cpus());
 
        if (mask != NULL)
@@ -975,9 +968,8 @@ cfs_cpu_notify(struct notifier_block *self, unsigned long action, void *hcpu)
                warn = any_online_cpu(*cpt_data.cpt_cpumask) >= nr_cpu_ids;
                mutex_unlock(&cpt_data.cpt_mutex);
                CDEBUG(warn ? D_WARNING : D_INFO,
-                      "Lustre: can't support CPU plug-out well now, "
-                      "performance and stability could be impacted "
-                      "[CPU %u action: %lx]\n", cpu, action);
+                      "Lustre: can't support CPU plug-out well now, performance and stability could be impacted [CPU %u action: %lx]\n",
+                      cpu, action);
        }
 
        return NOTIFY_OK;