On Sat 12-04-14 13:02:40, Ted Tso wrote:
> This shouldn't change any logic flow; just delete duplicated code.
>
> Signed-off-by: "Theodore Ts'o" <tytso@xxxxxxx>
Looks good. You can add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/ext4/file.c | 37 +++++++++++++------------------------
> 1 file changed, 13 insertions(+), 24 deletions(-)
>
> diff --git a/fs/ext4/file.c b/fs/ext4/file.c
> index 5e428d58..7c8f483 100644
> --- a/fs/ext4/file.c
> +++ b/fs/ext4/file.c
> @@ -98,6 +98,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
> struct file *file = iocb->ki_filp;
> struct inode *inode = file_inode(iocb->ki_filp);
> struct blk_plug plug;
> + int o_direct = file->f_flags & O_DIRECT;
> int overwrite = 0;
> size_t length = iov_length(iov, nr_segs);
> ssize_t ret;
> @@ -122,7 +123,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
> }
> }
>
> - if (unlikely(iocb->ki_filp->f_flags & O_DIRECT)) {
> + if (o_direct) {
> struct mutex *aio_mutex = NULL;
>
> /* Unaligned direct AIO must be serialized; see comment above */
> @@ -169,33 +170,21 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
> if (err == len && (map.m_flags & EXT4_MAP_MAPPED))
> overwrite = 1;
> }
> -
> - ret = __generic_file_aio_write(iocb, iov, nr_segs,
> - &iocb->ki_pos);
> - mutex_unlock(&inode->i_mutex);
> -
> - if (ret > 0) {
> - ssize_t err;
> -
> - err = generic_write_sync(file, iocb->ki_pos - ret, ret);
> - if (err < 0)
> - ret = err;
> - }
> - blk_finish_plug(&plug);
> - } else {
> + } else
> mutex_lock(&inode->i_mutex);
> - ret = __generic_file_aio_write(iocb, iov, nr_segs,
> - &iocb->ki_pos);
> - mutex_unlock(&inode->i_mutex);
>
> - if (ret > 0) {
> - ssize_t err;
> + ret = __generic_file_aio_write(iocb, iov, nr_segs, &iocb->ki_pos);
> + mutex_unlock(&inode->i_mutex);
>
> - err = generic_write_sync(file, iocb->ki_pos - ret, ret);
> - if (err < 0)
> - ret = err;
> - }
> + if (ret > 0) {
> + ssize_t err;
> +
> + err = generic_write_sync(file, iocb->ki_pos - ret, ret);
> + if (err < 0)
> + ret = err;
> }
> + if (o_direct)
> + blk_finish_plug(&plug);
>
> return ret;
> }
> --
> 1.9.0
>
> --
> 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
--
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
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
