From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932994AbcILTbc (ORCPT ); Mon, 12 Sep 2016 15:31:32 -0400 Received: from mout.web.de ([212.227.15.3]:65282 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755541AbcILTbO (ORCPT ); Mon, 12 Sep 2016 15:31:14 -0400 Subject: [PATCH 42/47] block-rbd: Rename jump labels in rbd_dev_image_probe() To: ceph-devel@vger.kernel.org, Alex Elder , Ilya Dryomov , Sage Weil References: <566ABCD9.1060404@users.sourceforge.net> <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Mon, 12 Sep 2016 21:31:03 +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: <57806eb1-10ed-582e-72d0-2975e1ee967a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:fomOYhewun+cqA0IbvVAaDFOely5XM8MEjkGzV69k/dgXWC+27M M5+10xvcnGPfNSZXFv1JkjOeJRztrLOqCd8DoH6+q2BeP0CdKHwVKBIest70g0il3f3oETO mfAao3zywk8sDsyjELiYnhtIHj3EPnbbhyQP9jzjZjDLBKxA1gG7CSo8z+olcTRFUsrICfC 5sO9F0g5ynf0fF8Y5oSeg== X-UI-Out-Filterresults: notjunk:1;V01:K0:03ZfSt4I4MU=:9uTD1ucAZG6vMgySfrbi8h YqD9dDnyxJrnMgCoNerIrUimjpUa6mBuzFwzhe9zhMpTy1IyeccW63sPC72TZTGLahQ9XkhQQ RIhyOkpTaLFsRvu/8lGVprT3sui8QE32q+5O/aGW7A+h6w/RqcUKPd5VwTdEmZH8GcgMxO1Pc ocuOOjNnMffGuM+O/GQx/5MkHWZCyk7aCYImh29cuDx26/vmeZqp+TJKOLcq/0Q6+AQSv3MAX P3fuP97vJ0SUWqJMHjBvePSuZLCWUe0oFHRx+/yotwyKiPbbJwMcPx0t1kTpCThuhKXW82CF3 CZEQQH9fXZQoIEBVpuiXv/hURdwR/4idY/yavaK5KFnd0zHwJT2AjhLB3IWy5ZVyOgS14/2fP cr7eFfkntXFXTnJhX4scGfCplZdjtJr/19GdJbFZtnHBCd4w1NAavg2bTMjS7wLFWVQ6triX9 B0HaYYhtPSZRHNrJq3iTlGmbDcxERJN6VQgNRo4AAcH7F4BAQfjOmmBLfyRf43Bsk+hKA3buV jXVsAf3CTcrVZ+0TcfVITtjlOPesokOmjYQ+aELwRfte9jaw5xfU9c3EtC7vsXHxWJZP33obV SPBZmJB3HRI3sFivrEDMtwcCEfNRu6lEZijHpP+jTQatHKlDvy4EYBJvzBEhDFtrBmcNC55RD GEHQrsfeDPhi0H5WdmdUGsslGx4yE3wydV4Q22zbQMQu3fQm4kASK00viOSUQOahFnpohmziW 4UTbxNXq1BT2dFq3nbSATrtLOxsWlTvtEiVuzVtEU2Ts5crJv/KnsL0KLo+poiQj+g/tBgK6y /JcdZBG Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 12 Sep 2016 20:02:16 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 80983f6..eec41ed 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -6108,7 +6108,7 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) ret = rbd_dev_header_name(rbd_dev); if (ret) - goto err_out_format; + goto status_indication; if (!depth) { ret = rbd_register_watch(rbd_dev); @@ -6117,13 +6117,13 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) pr_info("image %s/%s does not exist\n", rbd_dev->spec->pool_name, rbd_dev->spec->image_name); - goto err_out_format; + goto status_indication; } } ret = rbd_dev_header_info(rbd_dev); if (ret) - goto err_out_watch; + goto check_input; /* * If this image is the one being mapped, we have pool name and @@ -6141,13 +6141,13 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) rbd_dev->spec->pool_name, rbd_dev->spec->image_name, rbd_dev->spec->snap_name); - goto err_out_probe; + goto unprobe_device; } if (rbd_dev->header.features & RBD_FEATURE_LAYERING) { ret = rbd_dev_v2_parent_info(rbd_dev); if (ret) - goto err_out_probe; + goto unprobe_device; /* * Need to warn users if this image is the one being @@ -6160,18 +6160,17 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, int depth) ret = rbd_dev_probe_parent(rbd_dev, depth); if (ret) - goto err_out_probe; + goto unprobe_device; dout("discovered format %u image, header name is %s\n", rbd_dev->image_format, rbd_dev->header_oid.name); return 0; - -err_out_probe: + unprobe_device: rbd_dev_unprobe(rbd_dev); -err_out_watch: + check_input: if (!depth) rbd_unregister_watch(rbd_dev); -err_out_format: + status_indication: rbd_dev->image_format = 0; kfree(rbd_dev->spec->image_id); rbd_dev->spec->image_id = NULL; -- 2.10.0