On Fri, Jan 18, 2013 at 04:01:14PM +0800, Guo Chao wrote:
> brelse() and ext4_journal_force_commit() are both inlined and able
> to handle NULL.
>
> Signed-off-by: Guo Chao <yan@xxxxxxxxxxxxxxxxxx>
This one looks ok too, so:
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
PS: Does the order of the patches matter? Or are these just four patches that
are mostly independent of each other?
--D
> ---
> 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)
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
