Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751971AbcJAO7l (ORCPT ); Sat, 1 Oct 2016 10:59:41 -0400 Received: from mout.web.de ([212.227.17.11]:60085 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbcJAO7e (ORCPT ); Sat, 1 Oct 2016 10:59:34 -0400 Subject: [PATCH 14/15] md-cluster: Less function calls in lockres_init() after error detection To: linux-raid@vger.kernel.org, Guoqing Jiang , Shaohua Li References: <566ABCD9.1060404@users.sourceforge.net> <3a03df66-92ce-20fb-17f3-fb79b9d43c8e@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <6f650168-02dc-91e5-c47a-e3ead380252f@users.sourceforge.net> Date: Sat, 1 Oct 2016 16:59:20 +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: <3a03df66-92ce-20fb-17f3-fb79b9d43c8e@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:fvJm+JAZt66ePbnYKBdeZkfELBWI73hE7dnSxPJ4rMTW5ICN1fP 41fG+oNVThObjXCcIOAl6i6SlODvxAwZ1DShokrJ2ukV+HpSdA/BGkui/p/GDhQQeRjqs+q ZLwfPdNCxPrnfjc7re5BSPsUKUV3S1yzIWQVH+Xij36mzEaQt4ukDuE3lNhy0PGDrS0PsHs lS/46dSsWXxwHZ7m9IZ4g== X-UI-Out-Filterresults: notjunk:1;V01:K0:/i76xsOxb9Q=:Pquuzx90JOSGLcCiH9fpqp kwaZXFTjAfQzP8lwheDV9odlQRjZ4eHnzTPr+WTLXzw6waNPx2BHZTQtU0jzXZiKe6nrVTBbV BWdmFl9VyxklpJFMedoPWJptVS6YPK6ttTtw85Qx+m6ot8P7kdoSrpXZtQPyD6YgeGwXZ8mC3 cvtbNi5ngyoUIHv/mxYAlhqLio+8dJ2Xg3RbvCgBqzRX/SZRdBYvNI8WIg9D8iAKBZbPoxLNZ onN6DRYZnCUseNkI/QxfDW8HUjaicfTz20BfD4qIVBfzApTOQIp6Q3zZu8IdMIiKJ+5Cia884 6fWUfNHVrZKd8D4in3ZoLBjcDrqyeGsRvu+nFdUKZmDXGU2vRRf90PySkwWxDcZs9l2euhvdL mli22lj2gQI3xHtl8cYPdEE49hlNeFiGQ2HLGP04ciEW7k5S2rmd1rVLd2S9ZFcdRPyCNo53P r6BgwKUeeOROGiUxPnzWUksHpwhO2WjPENE47ZWwLUK089Te9pEp2BpLRHpOZbeQVO/iHB+Kw 0UPDpbjDxfQRvjbLxyCVeM30yMnu0nq8R6RoKEgjSoBLqduYGU/g03jKf2DatAF4y+0simDnf 1DjlSYcJZX0cA54WKlDNKHd6wfHcyC3nHnvcIUQPjGj7dmHr1/bvla+TdnyAtOG2uVf9Oxz1+ I/a5Wag7gJkiEcrHnjxJEQJnA+/0h+TGpblHfhMZigD5cABArrnvUNWVjUg5mNLOZ1SfBO+Nc vmb854T1xLDyE9Uoq+DX0Ud3DAf0Z9COdEGxLYq/s6yHVUYpwgBbbVJZZb5rmIJzxLB1imKFX 2U+XDyI Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1583 Lines: 55 From: Markus Elfring Date: Sat, 1 Oct 2016 16:01:05 +0200 The kfree() function was called in up to three cases by the lockres_init() function during error handling even if the passed data structure member (or variable) contained a null pointer. Adjust jump targets according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/md/md-cluster.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/md/md-cluster.c b/drivers/md/md-cluster.c index 36bb962..0cade1a 100644 --- a/drivers/md/md-cluster.c +++ b/drivers/md/md-cluster.c @@ -201,12 +201,12 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev, namelen = strlen(name); res->name = kzalloc(namelen + 1, GFP_KERNEL); if (!res->name) - goto out_err; + goto free_resource; strlcpy(res->name, name, namelen + 1); if (with_lvb) { res->lksb.sb_lvbptr = kzalloc(LVB_SIZE, GFP_KERNEL); if (!res->lksb.sb_lvbptr) - goto out_err; + goto free_name; res->flags = DLM_LKF_VALBLK; } @@ -218,15 +218,17 @@ static struct dlm_lock_resource *lockres_init(struct mddev *mddev, ret = dlm_lock_sync(res, DLM_LOCK_NL); if (ret) { pr_err("md-cluster: Unable to lock NL on new lock resource %s\n", name); - goto out_err; + goto free_lvb; } res->flags &= ~DLM_LKF_EXPEDITE; res->flags |= DLM_LKF_CONVERT; return res; -out_err: +free_lvb: kfree(res->lksb.sb_lvbptr); +free_name: kfree(res->name); +free_resource: kfree(res); return NULL; } -- 2.10.0