From patchwork Thu Sep 29 09:12:15 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: 9357751 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 5A9B2600C8 for ; Fri, 30 Sep 2016 08:05:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CD6E28F77 for ; Fri, 30 Sep 2016 08:05:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 415D629EB2; Fri, 30 Sep 2016 08:05:24 +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=ham version=3.3.1 Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D9C9C28F77 for ; Fri, 30 Sep 2016 08:05:23 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8U82u3u011830; Fri, 30 Sep 2016 04:02:56 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u8T9CIBP008268 for ; Thu, 29 Sep 2016 05:12:18 -0400 Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.38]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u8T9CIe8031263 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 29 Sep 2016 05:12:18 -0400 Received: from mout.web.de (mout.web.de [217.72.192.78]) (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 9A3A66ACB; Thu, 29 Sep 2016 09:12:17 +0000 (UTC) Received: from [192.168.1.2] ([78.49.118.68]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0Meje0-1ba2lk0dVw-00ODaD; Thu, 29 Sep 2016 11:12:16 +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: <091f083a-7858-787d-d862-496b7524ced1@users.sourceforge.net> Date: Thu, 29 Sep 2016 11:12:15 +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:JzS2SmkrRhkCdZ2Lgflibh20XBvECLtEALtUDrKzKglI0HtoM5Y 8CPgSHIS5/qlaDQd5uSa952PygRdMDz3avbiDGBA1JC+bS1WRWjqX/Dt1gjgv6oqDUN5zJD 3O2umFo6Z4xfc3tLeIgx2g1Isgg6Mm2ru/dwLqetoeoIF8oax0TZn9ObTQvtd6oe4MXsQqW gMj69u5yKL13DP5QiFGoQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AslIPk9KLYM=:lkYmNvX+J9MGLczKyjxArN 7xmO3ahgN8nIfR2LYze5nvlpywI2IAvJ8iie/ZWZomHw1XlhpgGRtcfZ/s5S6WnXW4gPgm6jV RtfFnKKLXYcArbQs0S/9dUQsIWEaQmFIboQZwuF/rXQOKUJIfWy1OQmnzmEJK/cPttpadOhSs vyKoqtAmpUFnP56/suGawwcQuPm1q4u3CuOfLkOEhKmLB3BDUkjk+BzbmnWAu6unlD88WJKRS +e18y37DASn7MrYH5WWXXNV6tMmAwMKiS63UGc22K7yikq2YuO0G7u9eWbd2i2z+xX7tl5F9E KJPTyfQLxNXqp9fmY9B2j/dQvWo4U96xfAq3BzVGw27Bwwe/tHaG8RQ77X1DVmn3r8fzyT3ni bGamKug2idtUmbcxBoej1pdi2NImddJvfY5kS7UISLJBPMOZC7+MaPe2qMmNzE73AGGAM/N3a vOnuzTeOePXI3EF8k87kScNJP7cs8pmIkYayoa8H5cWF4XPpekqlaVmP3N/LAcCvlsR7D7wxr M5md5C1ykGB0GbBM0waQbTfyjqzFp0qDwltyv9QR++hRSRglAxqHFdKQAIRRAxF4bSgZJlKMI ruBWTktTIczh6bpsbxOaem3jN3pHgUK4QKzaJdUjDZyFSm/K2QCNGZJA3SlQ5MVhZVrcP3LPs TTUZPCVvOn3YxLsufEzlu3MtrGewIc9HxUtTprTtY0ofFO2Npc5Ly4QIfbK+9qcsNcatMp30w XDXaqYmbYUYxMtjrlzQORoixz20tRgQuBBim71ygtB8ie9gWJ4a24X+r3QOpRdegSjHGdhR4U dT+23Hm X-Greylist: Sender IP whitelisted by DNSRBL, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 29 Sep 2016 09:12:18 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 29 Sep 2016 09:12:18 +0000 (UTC) for IP:'217.72.192.78' 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) 217.72.192.78 mout.web.de 217.72.192.78 mout.web.de X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.38 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 04/10] dm snapshot: Rename a jump label in pending_complete() 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 08:18:51 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/md/dm-snap.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c index 82b7604..a6b797f 100644 --- a/drivers/md/dm-snap.c +++ b/drivers/md/dm-snap.c @@ -1460,7 +1460,7 @@ static void pending_complete(void *context, int success) down_write(&s->lock); __invalidate_snapshot(s, -EIO); error = 1; - goto out; + goto remove_exception; } e = alloc_completed_exception(GFP_NOIO); @@ -1468,7 +1468,7 @@ static void pending_complete(void *context, int success) down_write(&s->lock); __invalidate_snapshot(s, -ENOMEM); error = 1; - goto out; + goto remove_exception; } *e = pe->e; @@ -1476,7 +1476,7 @@ static void pending_complete(void *context, int success) if (!s->valid) { free_completed_exception(e); error = 1; - goto out; + goto remove_exception; } /* Check for conflicting reads */ @@ -1487,8 +1487,7 @@ static void pending_complete(void *context, int success) * in-flight exception from the list. */ dm_insert_exception(&s->complete, e); - -out: +remove_exception: dm_remove_exception(&pe->e); snapshot_bios = bio_list_get(&pe->snapshot_bios); origin_bios = bio_list_get(&pe->origin_bios);