From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757294AbcILSsE (ORCPT ); Mon, 12 Sep 2016 14:48:04 -0400 Received: from mout.web.de ([212.227.15.4]:55421 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbcILSsC (ORCPT ); Mon, 12 Sep 2016 14:48:02 -0400 Subject: [PATCH 06/47] block-rbd: Rename jump labels in rbd_add_parse_args() 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: <96128866-0e4e-65bb-9342-44ce885616e5@users.sourceforge.net> Date: Mon, 12 Sep 2016 20:47:51 +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:0HJAiAZ4rdAyRq6Cq/cG3+9eigt6Dac5+ad/X/jr+TIy2ccZdrF p1RAt5wyQfj+gY5BP0XoEi7QphiDw5+WfWD7Nc7Gj9QLgkneaFN37O/RpUiKdsLLy0WlhMh QL9RCyD2UK6FNi8hVR+INoTd+hTsIbYWE8W9QthJldC9wnONoV/wQ2f3Mwh/2mzU++vXf5K 5pkCSK1JP0+c5k1H4m7XQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:N8U7k2mwF8E=:d8lQpWGm8wfwAHyTmD1Mem zA2GIEhGCZI+xhPFCVqz33TLwKCqE11K45U4oK7aVkZCORhzdOWQ4ZzzG6BhfnhGQgVRF50Rk mQP4jiDsuGDIrqxUCwzB7YV/LrW9idoURz9ZudK3W5+SM557YYu2Im057WdrHIF+pPIPORYKX UFPXK+hMN1T6f2oM49Kjx24BIUxXRQ195yU+CLszck1z5U5/88Z9qhKHKqcPc3AcIha++B3C6 HB8N4D133iKdZjDCQqWGmEu1eQfCzVizMRtlJX6G6Ffbcv8kuAmmoh1H1wlfpRoiww6gfK3cG 7VgvYSFMXgEg7jlImJxk8E6+I82RpkNTqQTeaCBl/b3TiOVfSTC6ar8z1Vs3IzNhOmdbrUqol 1MJwSl5dlt7kYj0+qWhVeQhv41e7UcaCmi7P8jmqDRzWDr6OrWfYq0geRhLWVwdbIvut/ksOh Pg3vuZNknnQd4u/I4FjqCYV6v9Q4EQt9d8yRMc4glUOgdRpoV6MxkymPPOS/HJV63HEAWODli 9xWmx23Ynl9lx9J5OPK4NeNV3DQ/SbJ9ULZUestfHGRkeqB1BZzSX+u+4+P2e3PjwX5iPKGSA d6oDttnA4fI7dp0j2T+vH+3fsOycw/S6ntZCWDogOF6Pueva0XmjYnQNZ8smkBXixLHHqgKu6 I2xoRLd6hF+QbgMIRd7unFp/F0rx83HgT3uJdKYVY6OosucIh6bH7eobr757hWrepBFpKAGHs CYZfU3iSlDGxEWm3oKLwJ3nyyFe6RP7C1VUGN3no7WAZ4g8Ag4wTIjXO4xLsRt+oJSketJYey MwjXSys Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 11 Sep 2016 15:20:48 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a6d9a06..dd4da1f 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5709,27 +5709,27 @@ static int rbd_add_parse_args(const char *buf, return -ENOMEM; if (!*options) { rbd_warn(NULL, "no options provided"); - goto out_err; + goto free_options; } spec = rbd_spec_alloc(); if (!spec) - goto out_mem; + goto status_indication; spec->pool_name = dup_token(&buf, NULL); if (!spec->pool_name) - goto out_mem; + goto status_indication; if (!*spec->pool_name) { rbd_warn(NULL, "no pool name provided"); - goto out_err; + goto free_options; } spec->image_name = dup_token(&buf, NULL); if (!spec->image_name) - goto out_mem; + goto status_indication; if (!*spec->image_name) { rbd_warn(NULL, "no image name provided"); - goto out_err; + goto free_options; } /* @@ -5742,11 +5742,11 @@ static int rbd_add_parse_args(const char *buf, len = sizeof (RBD_SNAP_HEAD_NAME) - 1; } else if (len > RBD_MAX_SNAP_NAME_LEN) { ret = -ENAMETOOLONG; - goto out_err; + goto free_options; } snap_name = kmemdup(buf, len + 1, GFP_KERNEL); if (!snap_name) - goto out_mem; + goto status_indication; *(snap_name + len) = '\0'; spec->snap_name = snap_name; @@ -5754,7 +5754,7 @@ static int rbd_add_parse_args(const char *buf, rbd_opts = kzalloc(sizeof (*rbd_opts), GFP_KERNEL); if (!rbd_opts) - goto out_mem; + goto status_indication; rbd_opts->read_only = RBD_READ_ONLY_DEFAULT; rbd_opts->queue_depth = RBD_QUEUE_DEPTH_DEFAULT; @@ -5764,7 +5764,7 @@ static int rbd_add_parse_args(const char *buf, parse_rbd_opts_token, rbd_opts); if (IS_ERR(copts)) { ret = PTR_ERR(copts); - goto out_err; + goto free_options; } kfree(options); @@ -5773,9 +5773,9 @@ static int rbd_add_parse_args(const char *buf, *rbd_spec = spec; return 0; -out_mem: + status_indication: ret = -ENOMEM; -out_err: + free_options: kfree(rbd_opts); rbd_spec_put(spec); kfree(options); -- 2.10.0