From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756953AbcILSrE (ORCPT ); Mon, 12 Sep 2016 14:47:04 -0400 Received: from mout.web.de ([212.227.17.12]:65483 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752266AbcILSrB (ORCPT ); Mon, 12 Sep 2016 14:47:01 -0400 Subject: [PATCH 05/47] block-rbd: One function call less in rbd_dev_image_id() 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: <532868bf-3209-9059-fc1e-5194ab99b776@users.sourceforge.net> Date: Mon, 12 Sep 2016 20:46:49 +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:cE+gmpsUz3axdQPNS0x4+j9lyEf87X1/OjyufYC64bfkS+GRhWO +063rP9w1isAUMkSLu9lNLJA7bK7elVDwkGwEDkzBsTrbKtXaajPO85g7saXQKuF8rWw/7Y 76ac+IyByGSLRAEFVjYOIMp1CJqzsg7ugcOx2CKGq3v42FW00hwrX282kZf2zrYSpw/MzOC BYHjna/iHmJNtzG2sjCWQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:TIgSNusZSJ4=:pRW2YfLJbO0znvHDxpu6dq 0cHa/IrWAO1KQg3or1qBkac4IGr7b/xdb7Tt8U9BpPxstM3V/wFA3uSuJv0zaOc/YBMthFrFu T5A7ZsH0Wz9BNUFkNkOqMzDXAf4/m6d2i00kcYy7Lv7TXxBKQEbhHNAuM5cEcT8m82vCzKHoy z5vfQkHZ2qlXRhd/vKqyX+UwQ6BbsudP2eqObQq+qdISa0Mo7E25vKkaceXsSHMd5IEYAlbyO 2YpLaA4eYq2LgTwENhxi+ksCU+N2nt5SO0/FG80SDdOqe8IzCr82riiRHRv9MoHqdSw+98w2N ZZwdXJpl3hrrMTOQxxoKz/86pUWim+KxmUdTyaE/r0fTfXFtzO1An+ETbUpbBrWbOSHU/UQrX g61LpPgd5Rph9MvtZbCdrnon+c8/JsV1EANrwF8VQqCOS1SuXvpRUsx/pCgEOK0iAQMS2dsQN shD76VhyHoKY4eQFMNGAEvs0lEWM5LqYvy/PZJ/XAf4OCD/HKYprCgcnU45RXQn4YWW9UE2Mf iPaOcIvS2g36f1kjFJ9Av9h43lUZhSZed0FkErIhgsjPBNDh3pvfMpogNTWYxO7+QAfC6QuAN JMAiRLr30pled1s6aqBD7nonzLLp2Ow/n1+CkekM7Vryn6R25id4HwPr110S2IVfYCgnQsOMe BAIFrAtH/8dI2rit5yre5/V0RZ0pkSlAyTbqniIRXnQ4MlizgDXhvzj58diQOilOMQ84T+M4+ N1OEWw7bxxRZgWCE2o+DsPfedi1NlvJm/28ybqCckWe4Pan36XFxMs9MUiW3wV5gHIAPV4SiJ QbdgeNq Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 11 Sep 2016 15:05:49 +0200 The kfree() function was called in one case by the rbd_dev_image_id() function during error handling even if the passed variable "response" contained a null pointer. Adjust a jump target according to the Linux coding style convention. Signed-off-by: Markus Elfring --- drivers/block/rbd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index c1da844..a6d9a06 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5865,7 +5865,7 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev) response = kzalloc(sizeof(__le32) + RBD_IMAGE_ID_LEN_MAX, GFP_NOIO); if (!response) { ret = -ENOMEM; - goto out; + goto free_name; } /* If it doesn't exist we'll assume it's a format 1 image */ @@ -5893,8 +5893,8 @@ static int rbd_dev_image_id(struct rbd_device *rbd_dev) rbd_dev->spec->image_id = image_id; dout("image_id is %s\n", image_id); } -out: kfree(response); + free_name: kfree(object_name); return ret; -- 2.10.0