From patchwork Fri Jan 18 08:01:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo Chao X-Patchwork-Id: 213518 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9969D2C008D for ; Fri, 18 Jan 2013 19:01:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750867Ab3ARIB1 (ORCPT ); Fri, 18 Jan 2013 03:01:27 -0500 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:55367 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750755Ab3ARIBZ (ORCPT ); Fri, 18 Jan 2013 03:01:25 -0500 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 18 Jan 2013 17:55:18 +1000 Received: from d23dlp01.au.ibm.com (202.81.31.203) by e23smtp09.au.ibm.com (202.81.31.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 18 Jan 2013 17:55:16 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp01.au.ibm.com (Postfix) with ESMTP id C04FB2CE804D for ; Fri, 18 Jan 2013 19:01:19 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0I7ndSV36765852 for ; Fri, 18 Jan 2013 18:49:39 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0I81JYo032024 for ; Fri, 18 Jan 2013 19:01:19 +1100 Received: from yanx.cn.ibm.com ([9.123.247.45]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0I81En3031807; Fri, 18 Jan 2013 19:01:18 +1100 From: Guo Chao To: tytso@mit.edu Cc: linux-ext4@vger.kernel.org Subject: [PATCH 4/4] ext4: remove unnecessary NULL pointer check Date: Fri, 18 Jan 2013 16:01:14 +0800 Message-Id: <1358496074-6228-4-git-send-email-yan@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358496074-6228-1-git-send-email-yan@linux.vnet.ibm.com> References: <1358496074-6228-1-git-send-email-yan@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011807-3568-0000-0000-0000030C1294 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org brelse() and ext4_journal_force_commit() are both inlined and able to handle NULL. Signed-off-by: Guo Chao Reviewed-by: Darrick J. Wong --- fs/ext4/namei.c | 3 +-- fs/ext4/super.c | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index e35ea3d..f0812c0 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2110,8 +2110,7 @@ static int ext4_dx_add_entry(handle_t *handle, struct dentry *dentry, journal_error: ext4_std_error(dir->i_sb, err); cleanup: - if (bh) - brelse(bh); + brelse(bh); dx_release(frames); return err; } diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 3d4fb81..f3acd6f 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4476,16 +4476,12 @@ static void ext4_clear_journal_err(struct super_block *sb, int ext4_force_commit(struct super_block *sb) { journal_t *journal; - int ret = 0; if (sb->s_flags & MS_RDONLY) return 0; journal = EXT4_SB(sb)->s_journal; - if (journal) - ret = ext4_journal_force_commit(journal); - - return ret; + return ext4_journal_force_commit(journal); } static int ext4_sync_fs(struct super_block *sb, int wait)