From patchwork Tue Nov 13 23:24:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: cgxu519 X-Patchwork-Id: 997425 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42vkHj0dfxz9s3C for ; Wed, 14 Nov 2018 10:25:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726730AbeKNJZg (ORCPT ); Wed, 14 Nov 2018 04:25:36 -0500 Received: from mout.gmx.net ([212.227.15.15]:60163 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726022AbeKNJZg (ORCPT ); Wed, 14 Nov 2018 04:25:36 -0500 Received: from localhost.localdomain ([113.87.88.48]) by mail.gmx.com (mrgmx002 [212.227.17.184]) with ESMTPSA (Nemesis) id 0MNq4h-1gO3lY30g7-007SZi; Wed, 14 Nov 2018 00:25:00 +0100 From: Chengguang Xu To: tytso@mit.edu, adilger.kernel@dilger.ca Cc: linux-ext4@vger.kernel.org, Chengguang Xu Subject: [PATCH] ext4: remove redundant condition check Date: Wed, 14 Nov 2018 07:24:48 +0800 Message-Id: <20181113232448.11071-1-cgxu519@gmx.com> X-Mailer: git-send-email 2.17.2 X-Provags-ID: V03:K1:Adm0E4/c/+a3agR2bTRqPSPGuctomnAf1f/Y1z/TqXKpdYprL/V 93EnbdUlf7lsd6b6Tqtbuqc3r1hwmnmbsQKym4DRT9B2QR/JqG+KUFrAd4gnyjtSTWwHqiw 0VyBAmOpcIteKEzTsjfZUL8vGysKjBLZ3hduVYbhVfCzRLp0m9KDlZG+d1539Tt0w5UX7K+ HDP24K5xyFwlF64EaR7Kw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V01:K0:Or7wMYtC5UQ=:PimWpmkvcz6CPbQ/vdKp+F q+zy6D6IeIoWj/96S3sjBxVHdXvwLJwLn/fCXRRzAXk4pgSLgYxgzwxMlvNVt2ShHVIhzDWU7 B2qhL49+0SmUpP6ZmQmeCvnYt3xCWJfhFmrUTFX0Vyjk0naZ8QfgsBfPWlMcJxZ4pVqe8mWXg FgxXtEtAfQIVjWtKNOHImrhvvllkn9wbZClKMM5O1SpmnaYJhxzdAjdnyv5HSL8rwJ4foxWEW qOLxLRkV/04UkTMroqggdSgQZJz7S7iKgHl67h/tubafrxNq8v7M8TTAPMJ+RPV2kF/m3n96N skys330G40DNCXW/N1RkHKO51w1daT/PO/fbKgZLPAaqTUPmohFe7TOOxc4zGOiVoc5XhIa4s f6lqKZMjggRVcGK7DL4FEK3GN5AJUOzN0vEUHj3+gf13dDCCqDHaqepXQMQm+Ukqaxq6MBy4p BOBoFgJaKPKMt94z2iV4iI1mxN4/rHpFIyzHTjkdMG4Pc3dKWx2HjPjVfztK2fpRVACaczfKD E7lakEnvJppEDySs+kpMiEyv0BmAR8YSKqi2tj7XzZz0yAT/GxxpYNKV0jOTvA1ypcrkDdqq2 BpQ9lYgU8USfNCMk1IxR4sgiOXTAGESpkXpucZQPITuSEC1Sjp2yLsoFtWhjcqT6uHVMShHp4 vLeP9APTH+Tcp4zlELX+HeDnkHqzPm6l1Yvbw4GCtyNcshlwmQQxp/0u92Px+1AIJwLsBY7Ut qyaDIi8S5DVZpGxgFBnF6cczW2tMVyIwym7zkAYwZ/orpEcCx9dS+kv8spPFXQFu6BRVFgo8O e60RIHUhBVfUkIFMCpZnAOomv2QDzy16jxK8zC/nBIVPhEhTr+GOIBoDpXkTnn1NZbTwLRZcu 1j7HNP57uA3YgnucxcE6I5Y00sm65ZUyn1Bqnc+9M= Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org ext4_xattr_destroy_cache() can handle NULL pointer correctly, so there is no need to check NULL pointer before calling ext4_xattr_destroy_cache(). Signed-off-by: Chengguang Xu Reviewed-by: Jan Kara --- fs/ext4/super.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 53ff6c2a26ed..30d4a4e69de8 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1000,14 +1000,13 @@ static void ext4_put_super(struct super_block *sb) invalidate_bdev(sbi->journal_bdev); ext4_blkdev_remove(sbi); } - if (sbi->s_ea_inode_cache) { - ext4_xattr_destroy_cache(sbi->s_ea_inode_cache); - sbi->s_ea_inode_cache = NULL; - } - if (sbi->s_ea_block_cache) { - ext4_xattr_destroy_cache(sbi->s_ea_block_cache); - sbi->s_ea_block_cache = NULL; - } + + ext4_xattr_destroy_cache(sbi->s_ea_inode_cache); + sbi->s_ea_inode_cache = NULL; + + ext4_xattr_destroy_cache(sbi->s_ea_block_cache); + sbi->s_ea_block_cache = NULL; + if (sbi->s_mmp_tsk) kthread_stop(sbi->s_mmp_tsk); brelse(sbi->s_sbh); @@ -4522,14 +4521,12 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) if (EXT4_SB(sb)->rsv_conversion_wq) destroy_workqueue(EXT4_SB(sb)->rsv_conversion_wq); failed_mount_wq: - if (sbi->s_ea_inode_cache) { - ext4_xattr_destroy_cache(sbi->s_ea_inode_cache); - sbi->s_ea_inode_cache = NULL; - } - if (sbi->s_ea_block_cache) { - ext4_xattr_destroy_cache(sbi->s_ea_block_cache); - sbi->s_ea_block_cache = NULL; - } + ext4_xattr_destroy_cache(sbi->s_ea_inode_cache); + sbi->s_ea_inode_cache = NULL; + + ext4_xattr_destroy_cache(sbi->s_ea_block_cache); + sbi->s_ea_block_cache = NULL; + if (sbi->s_journal) { jbd2_journal_destroy(sbi->s_journal); sbi->s_journal = NULL;