On Tue, Jul 17, 2012 at 09:31:06AM +0300, Dan Carpenter wrote:
> We recently changed how the locking worked here, but this error path was
> missed.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Sorry, it is my fault. Thanks for pointing out this bug.
Regards,
Zheng
>
> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
> index 8c84070..2728fb7 100644
> --- a/fs/ext4/inode.c
> +++ b/fs/ext4/inode.c
> @@ -3031,8 +3031,10 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
> if (!is_sync_kiocb(iocb)) {
> ext4_io_end_t *io_end =
> ext4_init_io_end(inode, GFP_NOFS);
> - if (!io_end)
> - return -ENOMEM;
> + if (!io_end) {
> + ret = -ENOMEM;
> + goto retake_lock;
> + }
> io_end->flag |= EXT4_IO_END_DIRECT;
> iocb->private = io_end;
> /*
> @@ -3094,6 +3096,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
> ext4_clear_inode_state(inode, EXT4_STATE_DIO_UNWRITTEN);
> }
>
> +retake_lock:
> /* take i_mutex locking again if we do a ovewrite dio */
> if (overwrite) {
> up_read(&EXT4_I(inode)->i_data_sem);
> --
> 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 kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
