Merge branch 'xfs-dio-fix-4.6' into for-next (acb3e26f) · Commits · 戴 / test

fs/dax.c

+7 −2

Original line number	Diff line number	Diff line
		@@ -267,8 +267,13 @@ ssize_t dax_do_io(struct kiocb iocb, struct inode inode,
		if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
		inode_unlock(inode);

		if ((retval > 0) && end_io)
		end_io(iocb, pos, retval, bh.b_private);
		if (end_io) {
		int err;

		err = end_io(iocb, pos, retval, bh.b_private);
		if (err)
		retval = err;
		}

		if (!(flags & DIO_SKIP_DIO_COUNT))
		inode_dio_end(inode);

+7 −2

Original line number	Diff line number	Diff line
		@@ -253,8 +253,13 @@ static ssize_t dio_complete(struct dio *dio, loff_t offset, ssize_t ret,
		if (ret == 0)
		ret = transferred;

		if (dio->end_io && dio->result)
		dio->end_io(dio->iocb, offset, transferred, dio->private);
		if (dio->end_io) {
		int err;

		err = dio->end_io(dio->iocb, offset, ret, dio->private);
		if (err)
		ret = err;
		}

		if (!(dio->flags & DIO_SKIP_DIO_COUNT))
		inode_dio_end(dio->inode);

+21 −9

Original line number	Diff line number	Diff line
		@@ -1504,15 +1504,6 @@ static inline int ext4_valid_inum(struct super_block *sb, unsigned long ino)
		ino <= le32_to_cpu(EXT4_SB(sb)->s_es->s_inodes_count));
		}

		static inline void ext4_set_io_unwritten_flag(struct inode *inode,
		struct ext4_io_end *io_end)
		{
		if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
		io_end->flag \|= EXT4_IO_END_UNWRITTEN;
		atomic_inc(&EXT4_I(inode)->i_unwritten);
		}
		}

		static inline ext4_io_end_t ext4_inode_aio(struct inode inode)
		{
		return inode->i_private;
		@@ -3293,6 +3284,27 @@ extern struct mutex ext4__aio_mutex[EXT4_WQ_HASH_SZ];
		extern int ext4_resize_begin(struct super_block *sb);
		extern void ext4_resize_end(struct super_block *sb);

		static inline void ext4_set_io_unwritten_flag(struct inode *inode,
		struct ext4_io_end *io_end)
		{
		if (!(io_end->flag & EXT4_IO_END_UNWRITTEN)) {
		io_end->flag \|= EXT4_IO_END_UNWRITTEN;
		atomic_inc(&EXT4_I(inode)->i_unwritten);
		}
		}

		static inline void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)
		{
		struct inode *inode = io_end->inode;

		if (io_end->flag & EXT4_IO_END_UNWRITTEN) {
		io_end->flag &= ~EXT4_IO_END_UNWRITTEN;
		/* Wake up anyone waiting on unwritten extent conversion */
		if (atomic_dec_and_test(&EXT4_I(inode)->i_unwritten))
		wake_up_all(ext4_ioend_wq(inode));
		}
		}

		#endif /* __KERNEL__ */

		#define EFSBADCRC EBADMSG /* Bad CRC detected */

+12 −12

Original line number	Diff line number	Diff line
		@@ -3161,14 +3161,14 @@ out:
		}
		#endif

		static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
		static int ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
		ssize_t size, void *private)
		{
		ext4_io_end_t *io_end = iocb->private;

		/* if not async direct IO just return */
		if (!io_end)
		return;
		return 0;

		ext_debug("ext4_end_io_dio(): io_end 0x%p "
		"for inode %lu, iocb 0x%p, offset %llu, size %zd\n",
		@@ -3176,9 +3176,19 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
		size);

		iocb->private = NULL;
		/*
		* Error during AIO DIO. We cannot convert unwritten extents as the
		* data was not written. Just clear the unwritten flag and drop io_end.
		*/
		if (size <= 0) {
		ext4_clear_io_unwritten_flag(io_end);
		size = 0;
		}
		io_end->offset = offset;
		io_end->size = size;
		ext4_put_io_end(io_end);

		return 0;
		}

		/*
		@@ -3301,16 +3311,6 @@ static ssize_t ext4_ext_direct_IO(struct kiocb iocb, struct iov_iter iter,
		if (io_end) {
		ext4_inode_aio_set(inode, NULL);
		ext4_put_io_end(io_end);
		/*
		* When no IO was submitted ext4_end_io_dio() was not
		* called so we have to put iocb's reference.
		*/
		if (ret <= 0 && ret != -EIOCBQUEUED && iocb->private) {
		WARN_ON(iocb->private != io_end);
		WARN_ON(io_end->flag & EXT4_IO_END_UNWRITTEN);
		ext4_put_io_end(io_end);
		iocb->private = NULL;
		}
		}
		if (ret > 0 && !overwrite && ext4_test_inode_state(inode,
		EXT4_STATE_DIO_UNWRITTEN)) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -139,16 +139,6 @@ static void ext4_release_io_end(ext4_io_end_t *io_end)
		kmem_cache_free(io_end_cachep, io_end);
		}

		static void ext4_clear_io_unwritten_flag(ext4_io_end_t *io_end)
		{
		struct inode *inode = io_end->inode;

		io_end->flag &= ~EXT4_IO_END_UNWRITTEN;
		/* Wake up anyone waiting on unwritten extent conversion */
		if (atomic_dec_and_test(&EXT4_I(inode)->i_unwritten))
		wake_up_all(ext4_ioend_wq(inode));
		}

		/*
		* Check a range of space and convert unwritten extents to written. Note that
		* we are protected from truncate touching same part of extent tree by the