Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1deefc9 authored by Guo Chao's avatar Guo Chao Committed by Theodore Ts'o
Browse files

ext4: remove unnecessary NULL pointer check 



brelse() and ext4_journal_force_commit() are both inlined and able
to handle NULL.

Signed-off-by: default avatarGuo Chao <yan@linux.vnet.ibm.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 41be871f

fs/ext4/namei.c

+1 −2
Original line number Diff line number Diff line
@@ -2110,7 +2110,6 @@ 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);

	dx_release(frames);

	return err;

fs/ext4/super.c

+1 −5
Original line number Diff line number Diff line
@@ -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)