From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757575AbcILTDR (ORCPT ); Mon, 12 Sep 2016 15:03:17 -0400 Received: from mout.web.de ([212.227.15.4]:64832 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755088AbcILTDP (ORCPT ); Mon, 12 Sep 2016 15:03:15 -0400 Subject: [PATCH 17/47] block-rbd: Rename jump labels in rbd_init_disk() 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:03: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:FeJepf4Xv2Qp6QF5PiwPGL+5dhYEr87+EooxeqtalOcEMhyUgKS lMUne3asaXakYm2siL2NYjLhH4y/vilVZ3DYnpOusMfTTaQNq/Ge6v2e/hT8JGgUJkVdXfJ ZektcxhD4lA+v6Z98YyRhBKk1K+g9Pubt/exwk0JohFxkeS2oS1eD+YKbM1D+79yvN8DzWc llJfi0kLkdRfZgdis89Gw== X-UI-Out-Filterresults: notjunk:1;V01:K0:Q0YOwmrWXP4=:gfWy9lzPKz5Ad6woRVqISy 05yE2kg5s2yPDD6rUFQpcPP7BtaqWNJ+j572FDa/YosBqUuSeGpNHEBUM6zQiVmATQnxUYRu2 ETZ+KUkmA93LuJ62kFPcC7Rq5YjxV8YXgfp7r/KSnZSzDmQrN+MD2HbGMP5EEIf/P4aDlrKRQ a4tLymSOiehek8HN7tFUSmnolurwBYZWp+hhT15+/SyyREtKlWQE+Yc4avAae5lajjD8v6TNW LVIxI79QNbbJUo+QtmBZ46MCUQ2T0Un8wsCW7cdQ/4REVcmcHqshzAUPxob/UpcN4T9mIpCnp pgAbbfRIJnv3FLr8Q0WTwpAuYKhH54c4nfyUEdLeuxlnghNg95YoRoHpIuzIKvHNaiUKRO8GO +gb8TkjwH/0YMbfAK+aHXeaLDoeyxIEzBvykmfP3/EsZSrG4fxbXiPmmmZC7Lrd5Hbnk1GpqF rca1+C71zaFxChiuGhgGiwkQOeNliPZZL0wNCY3EHhTtzQHAqjVsHkhNlv6Dk7OdLLuII9b7a 4Vm+gcBcR8AYvd1czWQ0+mlDt/g5owgwdd6v268Zbj9BKML6HOkQu7YGnJAdJZIuOJon8pmqC ST07I4lC7ruW0KcIdaBgMCzW1xNuWrQiaG/H9tIC1OgLlo4b8t9UtTM08T1eefVQd7mvk2DF1 Lym5lbNf5KxhZrstAoPfXbCNkOvntTV+S4Cv/BB3w2m9O2tkEUgIxZjAftcDhDD4lH476RfVk z51SQ0r4awjXd214fGvlVrr1ehiHJI10mnmugdVtlc3Do4k49l8CcmTvBs9eKZDKVhVV+nrOg aJb/vet 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 18:26:28 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 0b6f0f9..97d4d63 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -4500,12 +4500,12 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) err = blk_mq_alloc_tag_set(&rbd_dev->tag_set); if (err) - goto out_disk; + goto put_disk; q = blk_mq_init_queue(&rbd_dev->tag_set); if (IS_ERR(q)) { err = PTR_ERR(q); - goto out_tag_set; + goto free_tag_set; } queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q); @@ -4537,9 +4537,9 @@ static int rbd_init_disk(struct rbd_device *rbd_dev) rbd_dev->disk = disk; return 0; -out_tag_set: + free_tag_set: blk_mq_free_tag_set(&rbd_dev->tag_set); -out_disk: + put_disk: put_disk(disk); return err; } -- 2.10.0