Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp6781863imm; Tue, 28 Aug 2018 00:32:11 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYwQsqHE5JcqZzoXbJz/3eekGPB1iPMwhguFWk1AKvyrdk1hg2nH9rvRso2FlR0jQSTO/XS X-Received: by 2002:a63:4104:: with SMTP id o4-v6mr367954pga.146.1535441531141; Tue, 28 Aug 2018 00:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535441531; cv=none; d=google.com; s=arc-20160816; b=zp7UOIrAUm/O+YJE6DHPftLWw9DAz8VJGx1QRW21zsn4vGdi/P47rUDzAnXUUh57Iv BtoA5Xj5s5H8ONM3Zx2qQkceenncyG6N8hK/BYfzQ5rI6YP+DSc2bLPNHVnfK8JI8C2w uFD+WB/UDS+7aG/F7K8EEOCNo3uYgTNcUV/FRKVHmBSQCPoqMGEvwCFHyViXGydqqUWo omv+wByx1XFzOa9pgyk1VcFlGjBNEYigRuwClEhGKdwwbiCEFk0eHqQzbN/t7ro1+jXw Rh8KC+nUcazPIdGvuz8hW9TKlMFNr7R4+3UO6gg5u7S6us0awGpoQ6OUOaBTDUVvNCGc xZIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:to:from :arc-authentication-results; bh=pMDnNZ0aZansw419hQC159SsRuvAovdeUhFIEpzxjqQ=; b=KiWsGQtDUXAGlhENc/W7qQjU9GSPz82vo9yMdAO+mRk3ti6FshNQcK6zeUZ2c5Xhpk Y5VT2KSUMMhm1cMhxnm3SYr6+Whh523k4LSdjwQE7HTaNfHjn+JbSAsZmI8WTLUzx2gK 5zHIITc/ExpALj7rolTJLb5//REHLtuxuP3/IP3UoeNBpX3/1Y7aK49o2dwvNOWpVfVz YayIQl/OgfljI9hsLyxGUnMzkx0ZuRcT2Fz0iQqYIb6JxyQ5ZGlwHBzr5f3VijmnliW/ 5UVvdI34QEzlNi3kcbtvnbBx5S2zo4pGNOfU2rOs/uys6Ukpsc0+0xQmZ9czvUTCEzI6 13mw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r12-v6si344443pgm.141.2018.08.28.00.31.55; Tue, 28 Aug 2018 00:32:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727203AbeH1LUk (ORCPT + 99 others); Tue, 28 Aug 2018 07:20:40 -0400 Received: from cmccmta2.chinamobile.com ([221.176.66.80]:37523 "EHLO cmccmta2.chinamobile.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726439AbeH1LUk (ORCPT ); Tue, 28 Aug 2018 07:20:40 -0400 Received: from spf.mail.chinamobile.com (unknown[172.16.121.1]) by rmmx-syy-dmz-app05-12005 (RichMail) with SMTP id 2ee55b84fa077cc-281fd; Tue, 28 Aug 2018 15:30:16 +0800 (CST) X-RM-TRANSID: 2ee55b84fa077cc-281fd X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from localhost.localdomain (unknown[223.105.0.243]) by rmsmtp-syy-appsvr01-12001 (RichMail) with SMTP id 2ee15b84fa072c8-57919; Tue, 28 Aug 2018 15:30:16 +0800 (CST) X-RM-TRANSID: 2ee15b84fa072c8-57919 From: Ding Xiang To: axboe@kernel.dk, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] block: Fix unneeded NULL check Date: Tue, 28 Aug 2018 15:30:13 +0800 Message-Id: <1535441413-8583-1-git-send-email-dingxiang@cmss.chinamobile.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org if icq_cache is null, kmem_cache_destroy will do nothing. So, remove the null check. Signed-off-by: Ding Xiang --- block/elevator.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/block/elevator.c b/block/elevator.c index 5ea6e7d..6a06b5d 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); -- 1.9.1