From patchwork Sat Oct 21 18:55:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 10021489 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 1632A60375 for ; Sat, 21 Oct 2017 18:55:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA72E28807 for ; Sat, 21 Oct 2017 18:55:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADC0D28A92; Sat, 21 Oct 2017 18:55:29 +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 vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 54C6528807 for ; Sat, 21 Oct 2017 18:55:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932161AbdJUSz1 (ORCPT ); Sat, 21 Oct 2017 14:55:27 -0400 Received: from mout.web.de ([212.227.15.3]:52681 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932159AbdJUSz0 (ORCPT ); Sat, 21 Oct 2017 14:55:26 -0400 Received: from [192.168.1.2] ([78.49.207.83]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LrbLR-1d4ySC3UdR-013Quo; Sat, 21 Oct 2017 20:55:21 +0200 To: linux-block@vger.kernel.org, nbd@other.debian.org, Josef Bacik Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] nbd: Use common error handling code in nbd_genl_connect() Message-ID: <110a7553-d57c-6a77-a9f7-fdee43a60195@users.sourceforge.net> Date: Sat, 21 Oct 2017 20:55:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-GB X-Provags-ID: V03:K0:M7bLJY8A54sL5W+XQu0mIdgEUq0VWwV/iuReTH8LpRVShacf9IN glMvyH7+CP4Q2jSBxZLXDoRQ5slzs9/8HZK5v01a6vJizJYQQ2/w8qAa3ZXxWGVVRCyVCzl jj/m5D3FxMzyQ37ngJVJjXPvehQzpSV97IPOKDzO4SIGi6+YPyASzbBLNfop0TfbAHMb8qJ NuhDBJ16MT4J35IEw3HWw== X-UI-Out-Filterresults: notjunk:1; V01:K0:xuYXlF3aczw=:eT/VeGvCE86t3tcu4fyR0b yRb9BEyJjhj7tITgOa3/uXx9aqPYg1PH4HemTiZH5gI4jxK97C0ursGPhWvsirND2Xrsa8Zx5 LnuKeEEniFifnbG7fZHZU/zEIzzkpT2gln3Scxa2aiiJQi0HSLjJtU5RJJ2F63rBzWxxzP68u Bmk96yT2pglbvG1F0qCLDyG0Y2SCAN91zBI54yNrZw56JremRIOcluVI8KRJmpvKsTz7Pt3Jf FeP/AIm8NLH8gcvHSEftwg0f2pv77RX7FBXBWEUhpAn5MLDDe+2Ylu/YRicRtqPn5vyHA4z8g I+62PIYYJl7nCJwCjkRRjhsGl1eAS82MDhLo36TISa9lbhzqzX+l/GBfMYDZnSOuvF5WUhnGx XiJmdIYtOT4+ZnpJwmwhLu9RET6LsYy3y28slRI4Enz6QMBP91n8n8F4nj9Sn/VwS5W+2MW7p DFVlUtjo1CoAhdV6mNe+yOBKgJYT2wf9VVeo7VTaLf8sZPvxtGXzxfs3ThaWhKvDEMP8KP1X/ ha0a+scYfRIfatHqJz0mD/npqzk6vh2mqtXrosiu4Ta4jPgOCFxaoKtjsA4O/6h9m/3znReZn U46LeLdqJsqeM/YqEHbfx8d7l98zL1+0JkAmtnQGeeq3062SPdBFc8eLj/JS6viscOIbHCAhS AzpI00vfIMl5DG4FxvKvUkrgJPNAv/SxdZ3RlC3NDlbYvo8e8FAFIw4PquuJX6IdRR6gJFVLg ng2WYqArWdZQuMWoxGPkZlRyb90PsPde3mZVni4HQ6FJiJUxNzpQxFl8XrvBJKtWVWlbXFXsJ 4JyfxeNwvd7JYApe4ULmVrBVAbjxu+8yYa0PTa+YtIZaEKTUX4= Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 21 Oct 2017 20:50:37 +0200 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/block/nbd.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 883dfebd3014..05bd1fc70ee3 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -1585,22 +1585,18 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) if (ret == 0) { int new_index; new_index = nbd_dev_add(-1); - if (new_index < 0) { - mutex_unlock(&nbd_index_mutex); - printk(KERN_ERR "nbd: failed to add new device\n"); - return ret; - } + if (new_index < 0) + goto report_failure; + nbd = idr_find(&nbd_index_idr, new_index); } } else { nbd = idr_find(&nbd_index_idr, index); if (!nbd) { ret = nbd_dev_add(index); - if (ret < 0) { - mutex_unlock(&nbd_index_mutex); - printk(KERN_ERR "nbd: failed to add new device\n"); - return ret; - } + if (ret < 0) + goto report_failure; + nbd = idr_find(&nbd_index_idr, index); } } @@ -1716,6 +1712,11 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info) if (put_dev) nbd_put(nbd); return ret; + +report_failure: + mutex_unlock(&nbd_index_mutex); + pr_err("nbd: failed to add new device\n"); + return ret; } static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)