From patchwork Mon Aug 27 23:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 10577659 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 92BBA14BD for ; Mon, 27 Aug 2018 23:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 96B8B29CCC for ; Mon, 27 Aug 2018 23:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89EC829CF4; Mon, 27 Aug 2018 23:33:15 +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=-7.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,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 A020B29CCC for ; Mon, 27 Aug 2018 23:33:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727050AbeH1DWC (ORCPT ); Mon, 27 Aug 2018 23:22:02 -0400 Received: from mout.gmx.net ([212.227.17.20]:33533 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727026AbeH1DWC (ORCPT ); Mon, 27 Aug 2018 23:22:02 -0400 Received: from localhost.localdomain ([116.30.193.211]) by mail.gmx.com (mrgmx102 [212.227.17.174]) with ESMTPSA (Nemesis) id 0MFz0E-1g78ZU1xHq-00Eu0E; Tue, 28 Aug 2018 01:33:11 +0200 From: Chengguang Xu To: axboe@kernel.dk Cc: linux-block@vger.kernel.org, Chengguang Xu Subject: [PATCH] block: remove unnecessary condition check Date: Tue, 28 Aug 2018 07:31:11 +0800 Message-Id: <20180827233111.9324-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.1 X-Provags-ID: V03:K1:7X8DRYOmVm6jYXYzLVuQi920luGhPhBBjNYXjZqX4ea4nHpj+sm nWztn/SCSihacpMXT5VLGz6kKb5iA6Cbugjy5h5f1QbEI4ts9dqyj7Xc1gET0fQrzFQwV6D /kfewHewYkCbG2VQPe882ncIWVx63gx1SJj//PK/CsYDj0UqrrkTixOK6TmZoepD0P9X4kY h02V3wyD/eMQxSs+Objbg== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ms11dhc44T8=:yPfUZiBbv7NNgYZ6EH5nzp POXZKHgjgk652e8m9agjAqdALmA0OfBjlwmy2U2lqSsfjt87j2IhI+xP5JoJ8WEhT1yFxqyuN GF+RWFtrwCvQ7iikYTgTo5H4aCX0ay4EU1yPv1EL5gvVShck4WdrrfXv/fV+DN5/2rvL14DWd VWDykSO9LRgRTwVsLnjr6rDdScSg3frIJ+vEhH85Wmo2XXiet0/ALjqaTOAiyfXQFunlYoZsX lnNbTfEqN1s4Zeg+20T5FCYrAnQ7qVDUCDqYaQYcAu8ReQ+rnZbKPrJzIr/ugWkRobwSODGAB Wgcm+HVVILFWQWe82Mxl4I0dKKupAnqIdH3Jzm3PvXIpKORITWppwlSC3M+2yfEmnSXE5ix1V KOJNVip3zrwsSo8Tu4XHCpLtYav5Gat947Ea8I2itY7kAvELY9hy2byMtH4/ZT4654qN+n3m4 XGnUEbSht890z8EbJmR3PCntaznSGDsQPWws9X703gPj3qWPvIoh3HSCOlN62sWg5KFlJnKSi UP3863EO1EepsyAYyRJhxo59AADon3Xj+03hbir5NhXbtt/JHzznupQfzMXThJOd8BuDVqlK+ SLAnUfgzvv3kWv+wgXOyI4I/QWVuNNnOJGudJc3WQ2HZIqxVljdcpvTxx5fQ+iuavO/zeVTkB h3359enmVD4cs3Mn6qCGbddCzjip/nb61yDWyhAYb6yLeRAc78eO3u9lN08IeYcWUL1y2LvQ1 WOYyJH07gqkQhniRMQEirxCXNnAe4Nu1vMF57tLwATiLENGo1l8qGC0wDeM= 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 kmem_cache_destroy() can handle NULL pointer correctly, so there is no need to check e->icq_cache before calling kmem_cache_destroy(). Signed-off-by: Chengguang Xu --- block/elevator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 5ea6e7d600e4..6a06b5d040e5 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -895,8 +895,7 @@ int elv_register(struct elevator_type *e) spin_lock(&elv_list_lock); if (elevator_find(e->elevator_name, e->uses_mq)) { spin_unlock(&elv_list_lock); - if (e->icq_cache) - kmem_cache_destroy(e->icq_cache); + kmem_cache_destroy(e->icq_cache); return -EBUSY; } list_add_tail(&e->list, &elv_list);