From: SF Markus Elfring <elfring@users.sourceforge.net>
To: dm-devel@redhat.com, linux-raid@vger.kernel.org,
Alasdair Kergon <agk@redhat.com>,
Mike Snitzer <snitzer@redhat.com>, Shaohua Li <shli@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org,
Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH 09/10] dm snapshot: Combine substrings for seven error messages
Date: Thu, 29 Sep 2016 11:17:16 +0200 [thread overview]
Message-ID: <e8510754-7d0c-0081-e682-94cba351a3b4@users.sourceforge.net> (raw)
In-Reply-To: <080668d9-1e1e-e208-f9ea-ff718e8070e5@users.sourceforge.net>
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
next prev parent reply other threads:[~2016-09-29 9:17 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <566ABCD9.1060404@users.sourceforge.net>
2016-09-28 15:34 ` [PATCH 00/10] md/dm-crypt: Fine-tuning for five function implementations SF Markus Elfring
2016-09-28 15:36 ` [PATCH 01/10] md/dm-crypt: Use kcalloc() in crypt_alloc_tfms() SF Markus Elfring
2016-09-28 15:38 ` [PATCH 00/10] md/dm-crypt: Fine-tuning for five function implementations Mike Snitzer
2016-09-28 15:38 ` [PATCH 02/10] md/dm-crypt: Reduce the scope for a variable in crypt_alloc_tfms() SF Markus Elfring
2016-09-28 15:40 ` [PATCH 03/10] md/dm-crypt: Rename a jump label in crypt_message() SF Markus Elfring
2016-09-29 12:55 ` [dm-devel] " Theodore Ts'o
2016-09-29 15:43 ` SF Markus Elfring
2016-09-30 10:06 ` Dan Carpenter
2016-09-30 11:32 ` md/dm-crypt: Rename a jump label in crypt_message() ? SF Markus Elfring
2016-09-30 11:39 ` Bjørn Mork
2016-09-30 11:53 ` SF Markus Elfring
2016-09-30 12:06 ` Bjørn Mork
2016-09-30 12:54 ` SF Markus Elfring
2016-09-30 12:02 ` Dan Carpenter
2016-09-30 12:19 ` SF Markus Elfring
2016-09-28 15:41 ` [PATCH 04/10] md/dm-crypt: Delete an unnecessary variable initialisation in crypt_message() SF Markus Elfring
2016-09-28 15:42 ` [PATCH 05/10] md/dm-crypt: Rename a jump label in crypt_set_key() SF Markus Elfring
2016-09-29 12:56 ` [dm-devel] " Theodore Ts'o
2016-09-28 15:43 ` [PATCH 06/10] md/dm-crypt: Delete an unnecessary variable initialisation " SF Markus Elfring
2016-09-28 15:44 ` [PATCH 07/10] md/dm-crypt: Rename a jump label in crypt_iv_tcw_whitening() SF Markus Elfring
2016-09-28 15:45 ` [PATCH 08/10] md/dm-crypt: Return directly after a failed crypto_alloc_ahash() in crypt_iv_essiv_ctr() SF Markus Elfring
2016-09-28 15:46 ` [PATCH 09/10] md/dm-crypt: Two checks and one function call less in crypt_iv_essiv_ctr() after error detection SF Markus Elfring
2016-09-28 15:47 ` [PATCH 10/10] md/dm-crypt: Delete unnecessary variable initialisations in crypt_iv_essiv_ctr() SF Markus Elfring
2016-09-29 9:02 ` [PATCH 00/10] dm snapshot: Fine-tuning for several function implementations SF Markus Elfring
2016-09-29 9:07 ` [PATCH 01/10] dm snapshot: Use kmalloc_array() in init_origin_hash() SF Markus Elfring
2016-09-29 9:54 ` Paul Bolle
2016-09-29 10:02 ` Joe Perches
2016-09-29 11:12 ` Paul Bolle
2016-09-29 11:45 ` Paul Bolle
2016-09-29 15:01 ` Joe Perches
2016-09-29 19:43 ` Paul Bolle
2016-09-29 20:24 ` Joe Perches
2016-09-29 20:39 ` Paul Bolle
2016-09-29 20:56 ` Joe Perches
2016-09-29 21:14 ` Paul Bolle
2016-09-29 21:21 ` Joe Perches
2016-09-29 21:42 ` Paul Bolle
2016-09-30 7:14 ` dm snapshot: Use kmalloc_array() in init_origin_hash() ? SF Markus Elfring
2016-09-29 11:45 ` dm snapshot: Use kmalloc_array() in init_origin_hash() SF Markus Elfring
2016-09-29 12:59 ` Theodore Ts'o
2016-09-29 9:10 ` [PATCH 02/10] dm snapshot: Delete two error messages for a failed memory allocation SF Markus Elfring
2016-09-29 9:11 ` [PATCH 03/10] dm snapshot: Delete an unnecessary variable initialisation in snapshot_map() SF Markus Elfring
2016-09-29 9:12 ` [PATCH 04/10] dm snapshot: Rename a jump label in pending_complete() SF Markus Elfring
2016-09-29 9:13 ` [PATCH 05/10] dm snapshot: Delete unnecessary variable initialisations " SF Markus Elfring
2016-09-29 9:14 ` [PATCH 06/10] dm snapshot: Delete an unnecessary variable initialisation in snapshot_ctr() SF Markus Elfring
2016-09-29 9:15 ` [PATCH 07/10] dm snapshot: Delete an unnecessary variable initialisation in merge_callback() SF Markus Elfring
2016-09-29 9:16 ` [PATCH 08/10] dm snapshot: Delete an unnecessary variable initialisation in remove_single_exception_chunk() SF Markus Elfring
2016-09-29 9:17 ` SF Markus Elfring [this message]
2016-09-29 9:18 ` [PATCH 10/10] dm snapshot: Delete five unwanted spaces behind "list_for_each_entry" SF Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e8510754-7d0c-0081-e682-94cba351a3b4@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=agk@redhat.com \
--cc=dm-devel@redhat.com \
--cc=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=shli@kernel.org \
--cc=snitzer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).