diff options
| author | Guo Chao <yan@linux.vnet.ibm.com> | 2013-01-28 21:41:02 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2013-01-28 21:41:02 -0500 |
| commit | b1deefc99e668348f7c785c6ece5f6ff4c6d8b5c (patch) | |
| tree | ce16d0377ace3dfd7c0a4ecefc27f29a8ee431c2 /fs | |
| parent | 41be871f747f64e076b09a68ae82a643e2ffb215 (diff) | |
| download | blackbird-op-linux-b1deefc99e668348f7c785c6ece5f6ff4c6d8b5c.tar.gz blackbird-op-linux-b1deefc99e668348f7c785c6ece5f6ff4c6d8b5c.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ext4/namei.c | 3 | ||||
| -rw-r--r-- | 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 f4b95870870e..34ed624d2c56 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 dc0fb7b942cf..aac52738eb60 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) |
