OSDN Git Service

Staging: lustre: fld: fix split strings.
authorGary Rookard <garyrookard@gmail.com>
Tue, 11 Mar 2014 03:24:29 +0000 (23:24 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 17 Mar 2014 21:24:35 +0000 (14:24 -0700)
unsplit strings from two lines to one. Changes resulted
in line over 80 characters warning. Leaving the latter
of the two warnings for possible string grepping reasons.

Signed-off-by: Gary Alan Rookard <garyrookard@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/fld/fld_request.c

index 896f9fe..1f8abba 100644 (file)
@@ -138,9 +138,8 @@ fld_rrb_scan(struct lu_client_fld *fld, seqno_t seq)
                        return target;
        }
 
-       CERROR("%s: Can't find target by hash %d (seq "LPX64"). "
-              "Targets (%d):\n", fld->lcf_name, hash, seq,
-              fld->lcf_count);
+       CERROR("%s: Can't find target by hash %d (seq "LPX64"). Targets (%d):\n",
+               fld->lcf_name, hash, seq, fld->lcf_count);
 
        list_for_each_entry(target, &fld->lcf_targets, ft_chain) {
                const char *srv_name = target->ft_srv != NULL  ?
@@ -209,9 +208,8 @@ int fld_client_add_target(struct lu_client_fld *fld,
        LASSERT(tar->ft_srv != NULL || tar->ft_exp != NULL);
 
        if (fld->lcf_flags != LUSTRE_FLD_INIT) {
-               CERROR("%s: Attempt to add target %s (idx "LPU64") "
-                      "on fly - skip it\n", fld->lcf_name, name,
-                      tar->ft_idx);
+               CERROR("%s: Attempt to add target %s (idx "LPU64") on fly - skip it\n",
+                       fld->lcf_name, name, tar->ft_idx);
                return 0;
        } else {
                CDEBUG(D_INFO, "%s: Adding target %s (idx "
@@ -476,9 +474,8 @@ int fld_client_lookup(struct lu_client_fld *fld, seqno_t seq, mdsno_t *mds,
        target = fld_client_get_target(fld, seq);
        LASSERT(target != NULL);
 
-       CDEBUG(D_INFO, "%s: Lookup fld entry (seq: "LPX64") on "
-              "target %s (idx "LPU64")\n", fld->lcf_name, seq,
-              fld_target_name(target), target->ft_idx);
+       CDEBUG(D_INFO, "%s: Lookup fld entry (seq: "LPX64") on target %s (idx "LPU64")\n",
+                       fld->lcf_name, seq, fld_target_name(target), target->ft_idx);
 
        res.lsr_start = seq;
        fld_range_set_type(&res, flags);