From patchwork Fri Jul 22 19:51:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9244193 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 9CF4D60757 for ; Fri, 22 Jul 2016 19:52:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F5DF27FAB for ; Fri, 22 Jul 2016 19:52:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8436327FBB; Fri, 22 Jul 2016 19:52:05 +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 2CCD527FAB for ; Fri, 22 Jul 2016 19:52:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752352AbcGVTve (ORCPT ); Fri, 22 Jul 2016 15:51:34 -0400 Received: from mout.web.de ([212.227.15.3]:59015 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752200AbcGVTvc (ORCPT ); Fri, 22 Jul 2016 15:51:32 -0400 Received: from [192.168.1.2] ([77.182.75.73]) by smtp.web.de (mrweb003) with ESMTPSA (Nemesis) id 0LjJK3-1aue6y1nFn-00dVMX; Fri, 22 Jul 2016 21:51:27 +0200 Subject: [PATCH] block: Delete unnecessary checks before the function call "mempool_destroy" To: linux-block@vger.kernel.org, Jens Axboe 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> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <01dfd682-7b3e-c847-3e67-d859db3341cc@users.sourceforge.net> Date: Fri, 22 Jul 2016 21:51:26 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <5317A59D.4@users.sourceforge.net> X-Provags-ID: V03:K0:nB5iTl4A9K9kdB+YRksXidlsq8UOkt634nsnYf2aG0HqLrqdyAH b3pPd7eb8YQX7cHcLmTrsXLIvpfCQMwZXaFgPilVtRvCEY7N2MnAWJmW8lcRFVJpk/yeBwA +UpBTuo4P8jDqvVWhKrYv0KZh5LA8n4Nr4m/tg02NakrUfVA8Yo3zqG/4hv3nxvT7DsRd2p 1SWh4Z7YYvRSoYzIiX/HA== X-UI-Out-Filterresults: notjunk:1; V01:K0:YsFmKRgBoVY=:seTIN//c+mF8E2H6FBzYe8 mxzdnYRcF+9AH9QAbgenoEr+Bahc/eMoBuQzx9msRhrf/Whump1DqXzWf603xe4cbDYZU3RM1 tHeOnyVEzCklofUEcm+OMOBzACB67OCaLCctxw0YVfaogT8MXtHKiM4g1RCjdKkgwG6IWtvFc WPh7lrZtk43WKDw1KyPKCdpTlYOfny5nPVTGYuvJf/wzufDdMMPl0c2AyE11Rjchfqx3CetsL R39cewIq0KV5ydMO7lywE/+OzT12al/bzDsNmy7uP2UmNs5Vsw5EfaC8HIxSCHQGG6qvlcxgR tXcAExPHamstlyfNElCs4EC69+6ANCHL6v2JaHJa2xo6x77V97+ihjlRIjIkAq5LN+Tt44n5N GBXx7Z4bAjVPr3MhkV6WpiR0a2uk22NpvqIRhuMNSwBTZQ9+K1k9Q3+IhbBKn/w4RgShdjNIV tl642eqyU1sGkmnLwXqP8iHN5FgCD6EyIrhlsXYlD40Afm1FTz1LIqoFX/K0ujlupIXxjw4xt pA8Fbn2ncQrCcOIQDdHrWnJJqynxr7+ZDabKmPYu2vANos9lzs5cJSJmQ+lU2IGwqN+NwOrzA csIdxrvEd5PTMVJfwfFtqNlFdpLKCQKfJ7LDzpsxCCgoByFVbn+gCrYaSTz4FgfDm75DvA7bi zO389c9LZTpzIgXQPrmm8t7PSH8zpiDWSFRVsznnBc8ijQUmnedCkEe7F33z+oz9unmuipvix EvjxrpBBavVmLRn+w0pCl0G1JVAJsH0FTLQHQOpSVSNOJOsJxv6JtXWh1A4e5v6cyO8L7IJO8 PbIZDGq 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: Fri, 22 Jul 2016 21:45:26 +0200 The mempool_destroy() function tests whether its argument is NULL and then returns immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- block/bio-integrity.c | 7 ++----- block/bio.c | 8 ++------ block/blk-core.c | 3 +-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index f70cc3b..7506a3e 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -499,11 +499,8 @@ EXPORT_SYMBOL(bioset_integrity_create); void bioset_integrity_free(struct bio_set *bs) { - if (bs->bio_integrity_pool) - mempool_destroy(bs->bio_integrity_pool); - - if (bs->bvec_integrity_pool) - mempool_destroy(bs->bvec_integrity_pool); + mempool_destroy(bs->bio_integrity_pool); + mempool_destroy(bs->bvec_integrity_pool); } EXPORT_SYMBOL(bioset_integrity_free); diff --git a/block/bio.c b/block/bio.c index 54ee384..21a2222 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1843,12 +1843,8 @@ void bioset_free(struct bio_set *bs) if (bs->rescue_workqueue) destroy_workqueue(bs->rescue_workqueue); - if (bs->bio_pool) - mempool_destroy(bs->bio_pool); - - if (bs->bvec_pool) - mempool_destroy(bs->bvec_pool); - + mempool_destroy(bs->bio_pool); + mempool_destroy(bs->bvec_pool); bioset_integrity_free(bs); bio_put_slab(bs); diff --git a/block/blk-core.c b/block/blk-core.c index a687e9c..db8c6b4 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -636,8 +636,7 @@ int blk_init_rl(struct request_list *rl, struct request_queue *q, void blk_exit_rl(struct request_list *rl) { - if (rl->rq_pool) - mempool_destroy(rl->rq_pool); + mempool_destroy(rl->rq_pool); } struct request_queue *blk_alloc_queue(gfp_t gfp_mask)