From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753579AbbBBPU4 (ORCPT ); Mon, 2 Feb 2015 10:20:56 -0500 Received: from mout.web.de ([212.227.15.14]:51695 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273AbbBBPUy (ORCPT ); Mon, 2 Feb 2015 10:20:54 -0500 Message-ID: <54CF95CA.90102@users.sourceforge.net> Date: Mon, 02 Feb 2015 16:20:42 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Neil Brown , linux-raid@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 2/3] md/bitmap: Delete an unnecessary check before the function call "kfree" References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <54CF93BB.40206@users.sourceforge.net> In-Reply-To: <54CF93BB.40206@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:3HH56QBL5u5puVL86ZvU19F1h4LtHV1YsVRIV18kxJXRkyUj9I0 vkRwvXZEypkQSo5H91N6HHekjTy8+P6NSzoamWbeoHD+6ri0Tf+7QD68DlAWcxMrlT2iOyp SQg/NOXnTRtNqoGSLn5KZNozdJACD2oevYVBwNcQRW9ITKt/uOrEYQM5JjuxKbotYOsILxD U3qJPLjRWdL/WAReAi+lA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 2 Feb 2015 15:10:57 +0100 The kfree() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. * This issue was detected by using the Coccinelle software. * Let us also move an assignment for the variable "pages" to the place directly before it is really needed for a loop. * Let us also move another kfree() call into a block which should belong to a previous check for the variable "bp". Signed-off-by: Markus Elfring --- drivers/md/bitmap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index da3604e..47d72df 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1586,15 +1586,15 @@ static void bitmap_free(struct bitmap *bitmap) bitmap_file_unmap(&bitmap->storage); bp = bitmap->counts.bp; - pages = bitmap->counts.pages; /* free all allocated memory */ - - if (bp) /* deallocate the page memory */ + if (bp) { /* deallocate the page memory */ + pages = bitmap->counts.pages; for (k = 0; k < pages; k++) - if (bp[k].map && !bp[k].hijacked) + if (!bp[k].hijacked) kfree(bp[k].map); - kfree(bp); + kfree(bp); + } kfree(bitmap); } -- 2.2.2