From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932942AbcILTe2 (ORCPT ); Mon, 12 Sep 2016 15:34:28 -0400 Received: from mout.web.de ([212.227.15.14]:62076 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758108AbcILT3a (ORCPT ); Mon, 12 Sep 2016 15:29:30 -0400 Subject: [PATCH 40/47] block-rbd: One function call less in rbd_dev_probe_parent() after error detection 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: <41288740-f584-070d-125e-21a33d0255bf@users.sourceforge.net> Date: Mon, 12 Sep 2016 21:29:15 +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:SVmUYJsmJm/QTYVeNQbQospvSdGoLPl35hFeqDNRQtC31vjeY63 CuZudFNLo+K7DTplCUyJjWQwmlZak6RrN/jbSf93pQJAPj5o+ju+yQPpOcFZUXry/xWcisj QYlhj3D4F9PQ4+NqJ7SG1b/XT0qOkKzIG84HykJFtjcrXe/lN5Lfl+n2u+MtwyuSvImwPiB hwBElF7bNCCcA0roWfH2g== X-UI-Out-Filterresults: notjunk:1;V01:K0:ptUtGA9m6gs=:q6eXeHsYib6eomIjdOuIe+ SJgRNaVTslj6UNLdjkTs6lHOwTAje6hK/yz6vyV7jfWHu371Yv7hfx1UXkPrDr24EqOJVsCfJ +etMgw0K/H1f2KyAmfjg+g4FMJoye9kzQUwRYejb9h2+WVUYuDK0PV7+A87X/EiXPmDs9KtJM 3kCNBzaCosmoQ0rNSzOzpSbnw7o0uTEG5B0Yv62Bb0C8JU+GdKHE6lBgqpc9Z931o74UltpJy WsrrdBa63jWLALLxkYayu38X9LIfVrpsb87EIMujKTlp1DUIONbPUoIcQjNkTqc5JQnW0Q5V7 h4tzbOCLJ1pFz1sa5cqvg1QlvVJrKu3hdD5yZRls2Wy4AIQeWXLNLd249C/yA9LpSjh/mZNiH 6WFoq1ifP4FIPSfYJGPMVc1VJpG9sEeXs5PKX1I2cBr2AmUnGhC4LqantJG0nVdRIOq7WbrrQ yHJzT9RPuwE4yfITH29ybp0Z44/Ji3lcD+Mduys1TasLzO+CMB+r2xx8MiWtM00GV2F+yLonm J+wRNtZelEtViodXYxKLf+LxkyDBHvHzrcWi3bhuzdUDhEUCr2a871MKI0ulK2I4EjPR6HwiB V0SczYwrI9r1fRc69H9dmN6HqPqlePO32qluBH7ivjvUY6A9w4+TqNA2I3QTieJQqimrpGmzN vutfT+iWFI4MS2O9M/gCfmZ+Y2Dyb/hkv68R2u3ceyuZID8sUTWgccsc+fHIhgvKduXCZCktv 1SkSRVlgOlV8ujZFBdRehavSGbYBH1MxPJ0D3qM5LQUuE9XEaYvycB5UwsXuN14pnRqUh5HtB +VH+UoI 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:00:08 +0200 The rbd_dev_destroy() function was called in two cases by the rbd_dev_probe_parent() function during error handling even if the passed variable contained a null pointer. * Adjust jump targets according to the current Linux coding style convention. * Delete an initialisation for the variable "parent" at the beginning which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index e01df3c..a037a5d 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5950,7 +5950,7 @@ out_err: */ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) { - struct rbd_device *parent = NULL; + struct rbd_device *parent; int ret; if (!rbd_dev->parent_spec) @@ -5959,13 +5959,13 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) if (++depth > RBD_MAX_PARENT_CHAIN_LEN) { pr_info("parent chain is too long (%d)\n", depth); ret = -EINVAL; - goto out_err; + goto unparent_device; } parent = __rbd_dev_create(rbd_dev->rbd_client, rbd_dev->parent_spec); if (!parent) { ret = -ENOMEM; - goto out_err; + goto unparent_device; } /* @@ -5977,15 +5977,15 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) ret = rbd_dev_image_probe(parent, depth); if (ret < 0) - goto out_err; + goto destroy_device; rbd_dev->parent = parent; atomic_set(&rbd_dev->parent_ref, 1); return 0; - -out_err: - rbd_dev_unparent(rbd_dev); + destroy_device: rbd_dev_destroy(parent); + unparent_device: + rbd_dev_unparent(rbd_dev); return ret; } -- 2.10.0