summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Chao <yan@linux.vnet.ibm.com>2013-01-28 21:41:02 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-01-28 21:41:02 -0500
commitb1deefc99e668348f7c785c6ece5f6ff4c6d8b5c (patch)
treece16d0377ace3dfd7c0a4ecefc27f29a8ee431c2
parent41be871f747f64e076b09a68ae82a643e2ffb215 (diff)
downloadop-kernel-dev-b1deefc99e668348f7c785c6ece5f6ff4c6d8b5c.zip
op-kernel-dev-b1deefc99e668348f7c785c6ece5f6ff4c6d8b5c.tar.gz
ext4: remove unnecessary NULL pointer check
brelse() and ext4_journal_force_commit() are both inlined and able to handle NULL. Signed-off-by: Guo Chao <yan@linux.vnet.ibm.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/namei.c3
-rw-r--r--fs/ext4/super.c6
2 files changed, 2 insertions, 7 deletions
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index f4b9587..34ed624d 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 dc0fb7b..aac5273 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4480,16 +4480,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)
OpenPOWER on IntegriCloud