xfs: Use iomap_dio_rw to wait for unaligned direct IO (906753be) · Commits · 戴 / test

Use iomap_dio_rw() to wait for unaligned direct IO instead of opencoding the wait. Signed-off-by:

fs/xfs/xfs_file.c

+4 −8

Original line number	Diff line number	Diff line
		@@ -547,16 +547,12 @@ xfs_file_dio_aio_write(
		}

		trace_xfs_file_direct_write(ip, count, iocb->ki_pos);
		ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops,
		is_sync_kiocb(iocb));

		/*
		* If unaligned, this is the only IO in-flight. If it has not yet
		* completed, wait on it before we release the iolock to prevent
		* subsequent overlapping IO.
		* If unaligned, this is the only IO in-flight. Wait on it before we
		* release the iolock to prevent subsequent overlapping IO.
		*/
		if (ret == -EIOCBQUEUED && unaligned_io)
		inode_dio_wait(inode);
		ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops,
		is_sync_kiocb(iocb) \|\| unaligned_io);
		out:
		xfs_iunlock(ip, iolock);