From patchwork Thu Sep 29 09:17:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9357755 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A2D3608A0 for ; Fri, 30 Sep 2016 08:05:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D60528F77 for ; Fri, 30 Sep 2016 08:05:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 71F5D29EB0; Fri, 30 Sep 2016 08:05:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E50D929EB1 for ; Fri, 30 Sep 2016 08:05:26 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8U82w4D010056; Fri, 30 Sep 2016 04:02:58 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8T9HKp1009343 for ; Thu, 29 Sep 2016 05:17:20 -0400 Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8T9HKtU013351 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 29 Sep 2016 05:17:20 -0400 Received: from mout.web.de (mout.web.de [212.227.17.12]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 56ACFA0CD0; Thu, 29 Sep 2016 09:17:19 +0000 (UTC) Received: from [192.168.1.2] ([78.49.118.68]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0LmLoU-1bGkwh1pNi-00Zxo4; Thu, 29 Sep 2016 11:17:17 +0200 To: dm-devel@redhat.com, linux-raid@vger.kernel.org, Alasdair Kergon , Mike Snitzer , Shaohua Li References: <566ABCD9.1060404@users.sourceforge.net> <080668d9-1e1e-e208-f9ea-ff718e8070e5@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Thu, 29 Sep 2016 11:17:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <080668d9-1e1e-e208-f9ea-ff718e8070e5@users.sourceforge.net> X-Provags-ID: V03:K0:zx7McX8ROlx9yUEQ0s7TXCHhDdRl+uw3KjxJHgBg0PZWWTSJ4ky UwNxR4mohVgE4jZWMGEB0OJb74O1vhhL3mpN4e2WR2OzTe/xdKf5vYByuw0vWHS/3RIPC8d RkfLeeu1E3k0MT4pfNUjbvn8HK5WrlMOF1xs4zfbyNDY5FJmO2CLTfvuU0bf6CrGPmgYvfz ctflOlr5IzXlCMPtTagpQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:lOaipovzcN0=:glytf2UNg45oiXCJt/D3XR +1caw+6DdkFggS7hQu5r777wPXBRvpK+z52WBxuxx2JkzvNPNtpIVmWWKvXgnykApVo7btG6n nirG/a6I9lJyrLNiSL5RNmqn6+I/Mc3tUz5gSoKLPcl3Aacs665tbZyRgBuhMndAdlQwnjWbH P5MUUKydAzLfgThClvvniKYAYcr7xNxldBUpfyxHzSe3DGyUl1bCPUI3s/GyK3hz/2iTqavhU 8oQekNr6+qiHgU42SmVkSTGyyN6/+j31p2ur5sVLywTY5IK/MlEjdhBWoWWuJn4py27pYqeEL eTrAt2KHhbkfeNjK9fcXRFkqSLT2w7/G8oCrq0QoXvfH5yn65sw7Njt0vCmirtGNZ4fG9/nnk 5LYhhR2FiITvGO6D+z3JqmL2R7D9ZSbKjXMC+J5Pq7kbTS8qKEcQv6ioXX29/2PFTWpZvvBEF icb1SA2J9X6bnz0r7UiD/0AXT6tGkLyuWmxC8+QGiyFsa4ycYNlGBOguT/KldiEI7vIJHVaT1 vyENOTyfiusKlnJedLHfiaNpyupYONpiwtCnAQlxzdHY6qvCXGYD+FG24GuAbc7M5rz9m/2Ki qcfca5M5Qy3RCwebA8ba45w+s/xe/MUqIcdBYVJHZxN49oPmng1ACcyius3TTV09/9KgETqVE I4zeI1M4QPjJMulOILvujXLfP3TcFOiK6pD5aqSIE/14DxZm176QN4Ps0u2NzoBrCjz0E95uD WyhLkneV1TOLPVeUDoZI6i7kAS8ASTcdYYsuDs7V9GC/WqeL3ADMgbxMmZa7ZHKKC+W1Ngg70 yhxzVPm X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 29 Sep 2016 09:17:19 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 29 Sep 2016 09:17:19 +0000 (UTC) for IP:'212.227.17.12' DOMAIN:'mout.web.de' HELO:'mout.web.de' FROM:'elfring@users.sourceforge.net' RCPT:'' X-RedHat-Spam-Score: 0.079 (BAYES_50, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 212.227.17.12 mout.web.de 212.227.17.12 mout.web.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.25 X-loop: dm-devel@redhat.com X-Mailman-Approved-At: Fri, 30 Sep 2016 04:02:16 -0400 Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML Subject: [dm-devel] [PATCH 09/10] dm snapshot: Combine substrings for seven error messages X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring 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 --- 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);