Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1493233

[PATCH 09/10] dm snapshot: Combine substrings for seven error messages

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 29 Sep 2016 09:46:32 +0200

The script "checkpatch.pl" can point information out like the following.

WARNING: quoted string split across lines

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/md/dm-snap.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 4966584..7593986 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -468,8 +468,7 @@ static int __validate_exception_handover(struct dm_snapshot *snap)
 	if ((__find_snapshots_sharing_cow(snap, &snap_src, &snap_dest,
 					  &snap_merge) == 2) ||
 	    snap_dest) {
-		snap->ti->error = "Snapshot cow pairing for exception "
-				  "table handover failed";
+		snap->ti->error = "Snapshot cow pairing for exception table handover failed";
 		return -EINVAL;
 	}
 
@@ -496,8 +495,7 @@ static int __validate_exception_handover(struct dm_snapshot *snap)
 
 	if (!snap_src->store->type->prepare_merge ||
 	    !snap_src->store->type->commit_merge) {
-		snap->ti->error = "Snapshot exception store does not "
-				  "support snapshot-merge.";
+		snap->ti->error = "Snapshot exception store does not support snapshot-merge.";
 		return -EINVAL;
 	}
 
@@ -858,8 +856,7 @@ static int __remove_single_exception_chunk(struct dm_snapshot *s,
 
 	e = dm_lookup_exception(&s->complete, old_chunk);
 	if (!e) {
-		DMERR("Corruption detected: exception for block %llu is "
-		      "on disk but not in memory",
+		DMERR("Corruption detected: exception for block %llu is on disk but not in memory",
 		      (unsigned long long)old_chunk);
 		return -EINVAL;
 	}
@@ -886,8 +883,7 @@ static int __remove_single_exception_chunk(struct dm_snapshot *s,
 		e->new_chunk++;
 	} else if (old_chunk != e->old_chunk +
 		   dm_consecutive_chunk_count(e)) {
-		DMERR("Attempt to merge block %llu from the "
-		      "middle of a chunk range [%llu - %llu]",
+		DMERR("Attempt to merge block %llu from the middle of a chunk range [%llu - %llu]",
 		      (unsigned long long)old_chunk,
 		      (unsigned long long)e->old_chunk,
 		      (unsigned long long)
@@ -980,8 +976,7 @@ static void snapshot_merge_next_chunks(struct dm_snapshot *s)
 						      &new_chunk);
 	if (linear_chunks <= 0) {
 		if (linear_chunks < 0) {
-			DMERR("Read error in exception store: "
-			      "shutting down merge");
+			DMERR("Read error in exception store: shutting down merge");
 			down_write(&s->lock);
 			s->merge_failed = 1;
 			up_write(&s->lock);
@@ -1877,12 +1872,10 @@ static int snapshot_preresume(struct dm_target *ti)
 	if (snap_src && snap_dest) {
 		down_read(&snap_src->lock);
 		if (s == snap_src) {
-			DMERR("Unable to resume snapshot source until "
-			      "handover completes.");
+			DMERR("Unable to resume snapshot source until handover completes.");
 			r = -EINVAL;
 		} else if (!dm_suspended(snap_src->ti)) {
-			DMERR("Unable to perform snapshot handover until "
-			      "source is suspended.");
+			DMERR("Unable to perform snapshot handover until source is suspended.");
 			r = -EINVAL;
 		}
 		up_read(&snap_src->lock);
-- 
2.10.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/10] dm snapshot: Fine-tuning for several function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:10 +0200
  [PATCH 10/10] dm snapshot: Delete five unwanted spaces behind  "list_for_each_entry" SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 07/10] dm snapshot: Delete an unnecessary variable  initialisation in merge_callback() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 09/10] dm snapshot: Combine substrings for seven error  messages SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 06/10] dm snapshot: Delete an unnecessary variable  initialisation in snapshot_ctr() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 02/10] dm snapshot: Delete two error messages for a failed  memory allocation SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 05/10] dm snapshot: Delete unnecessary variable  initialisations in pending_complete() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 03/10] dm snapshot: Delete an unnecessary variable  initialisation in snapshot_map() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 08/10] dm snapshot: Delete an unnecessary variable  initialisation in remove_single_exception_chunk() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200
  [PATCH 04/10] dm snapshot: Rename a jump label in pending_complete() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-09-29 11:20 +0200

csiph-web