From: Jens Axboe Date: Wed, 15 Apr 2015 21:51:12 +0000 (-0600) Subject: ext4: pass in DIO_SKIP_DIO_COUNT to do_blockdev_direct_IO() X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=refs%2Fheads%2Fi_dio_count;p=linux-2.6-block.git ext4: pass in DIO_SKIP_DIO_COUNT to do_blockdev_direct_IO() For writes, ext4_ext_direct_IO() already holds the inode i_dio_count elevated, so we don't need the extra inc/dec that is done in do_blockdev_direct_IO(). Pass in DIO_SKIP_DIO_COUNT to tell it that. Cc: Theodore Ts'o Signed-off-by: Jens Axboe --- diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 62d4615aa9b0..2605355791a3 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -2977,8 +2977,10 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, * conversion. This also disallows race between truncate() and * overwrite DIO as i_dio_count needs to be incremented under i_mutex. */ - if (rw == WRITE) + if (rw == WRITE) { inode_dio_inc(inode); + dio_flags |= DIO_SKIP_DIO_COUNT; + } /* If we do a overwrite dio, i_mutex locking can be released */ overwrite = *((int *)iocb->private); @@ -3032,7 +3034,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb, get_block_func = ext4_get_block_write_nolock; } else { get_block_func = ext4_get_block_write; - dio_flags = DIO_LOCKING; + dio_flags |= DIO_LOCKING; } if (IS_DAX(inode)) ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func,