From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933022AbcILTfa (ORCPT ); Mon, 12 Sep 2016 15:35:30 -0400 Received: from mout.web.de ([212.227.15.4]:53072 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932713AbcILTfX (ORCPT ); Mon, 12 Sep 2016 15:35:23 -0400 Subject: [PATCH 46/47] block-rbd: Rename jump labels in rbd_init() 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: <5183e609-e94b-8041-e69e-4424e30ae45d@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:35:12 +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:yHB/t0Sz25AlY8VcCAcAYsJL/+vnSR3ew/4g644j55B4t+o5rHY cPQf+ZmJqyOhXDvse6LLXdLNs7dOFVydGmIWdblfitN67SH9+9RdlsVnvxsMiSJohT7eEsV NPd4fivRHKCdRTf+IFQZL+X2nNXPA6AYfS5pNWOXd9+Ce7WKjwQ0vPYdtUqiLsKwErxtTUY iH8poSVsGL79k/useMr9g== X-UI-Out-Filterresults: notjunk:1;V01:K0:9el8rMcR0/A=:arHBI8ttahcM/RPY3QsMfd g3ppRPj2QearUI3fJXLbrbiU9r/dFkE0PORKWrUUL0FSI7EzyCPpVtm8toc23buM8YeWJPkjP 8YT4PBoe6j89PdqF0m9hV8LVcqUarOlFFRTDTBb7IoIxEkSjp4OyZaENZ69qDGmBUqlgAaYEz pvf55hHGmfWmFD3DmizqfHvkK5QmSYpO0yByNcXx+keQJ8fQxu2Gr7ejE1ZM7CQmZV4T7Tl5W EoabQzAm3n+Qw7+SvQBkQB73BndU8p56m/XALq/gDLlkrlD8zXr2yZof9ubwJY8KM/Gr+u+Oq zyAEpDfejvK85wHKGgwwMg2pIAd8ooQSEERILXnsMs/TiLmyS3CmamKbCoUYDZat+tu4sABnT DBEd/1NfVYy7rqvgxAF31Hr0aF49J1qNbcVuskPNNAmBLeZRO7lnNsMo6paiMlGSbTJqymITg EMKHfW/oFRKNem/UbmgEkiYrnxnPHy5wLJ3qNrVb9cjgwnW22M31b1pOX2n+jsP0KuYK14zcI V4PqLNQpjK3d5EDZ8ogKx+UDj7fyHIxpoVYDHQxm6JP8rZtVSQcDHEX9xsLe4I2ZsEHkpEzQL OrRTDs1HL/Ulqf0JWGJidf2qBtkjIrmxb3C51TqWYsSEKpVJR8A+oG0z3LM0w7T984qOMaO+I gVTjP8vDFKspr4bOtLJb8gY2TBSwG8BwWK5tjb9X77BbxFFLbruELM6veFAOZNOu77YHH58vm HsCPSxbox9D6SeZXYy18HyoYLWMkBal6ij7cPKM7bCXt0Rt7N9+PihpwQ8N+7ZfrSigW7Ic49 nGgxkpR 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:06:54 +0200 Adjust jump labels according to the current Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 8802a06..8897815 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -6506,20 +6506,20 @@ static int __init rbd_init(void) rbd_wq = alloc_workqueue(RBD_DRV_NAME, WQ_MEM_RECLAIM, 0); if (!rbd_wq) { rc = -ENOMEM; - goto err_out_slab; + goto exit_slab; } if (single_major) { rbd_major = register_blkdev(0, RBD_DRV_NAME); if (rbd_major < 0) { rc = rbd_major; - goto err_out_wq; + goto destroy_workqueue; } } rc = rbd_sysfs_init(); if (rc) - goto err_out_blkdev; + goto check_single; if (single_major) pr_info("loaded (major %d)\n", rbd_major); @@ -6527,13 +6527,12 @@ static int __init rbd_init(void) pr_info("loaded\n"); return 0; - -err_out_blkdev: + check_single: if (single_major) unregister_blkdev(rbd_major, RBD_DRV_NAME); -err_out_wq: + destroy_workqueue: destroy_workqueue(rbd_wq); -err_out_slab: + exit_slab: rbd_slab_exit(); return rc; } -- 2.10.0