Commit c355c656 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Elder
Browse files

xfs: remove IO_ISAIO 



We set the IO_ISAIO flag for all read/write I/O since early Linux
2.6.x.  Remove it as it has lost it's purpose long ago.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <david@fromorbit.com>
Reviewed-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarAlex Elder <aelder@sgi.com>
parent fc5bc4c8

fs/xfs/linux-2.6/xfs_file.c

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ xfs_file_aio_read( 
	loff_t			pos)

{

	struct file		*file = iocb->ki_filp;

	int			ioflags = IO_ISAIO;

	int			ioflags = 0;



	BUG_ON(iocb->ki_pos != pos);

	if (unlikely(file->f_flags & O_DIRECT))
@@ -71,7 +71,7 @@ xfs_file_aio_write( 
	loff_t			pos)

{

	struct file		*file = iocb->ki_filp;

	int			ioflags = IO_ISAIO;

	int			ioflags = 0;



	BUG_ON(iocb->ki_pos != pos);

	if (unlikely(file->f_flags & O_DIRECT))

fs/xfs/linux-2.6/xfs_lrw.c

+0 −5
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ xfs_read( 


	iocb->ki_pos = *offset;

	ret = generic_file_aio_read(iocb, iovp, segs, *offset);

	if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO))

		ret = wait_on_sync_kiocb(iocb);

	if (ret > 0)

		XFS_STATS_ADD(xs_read_bytes, ret);
@@ -774,9 +772,6 @@ write_retry: 


	current->backing_dev_info = NULL;



	if (ret == -EIOCBQUEUED && !(ioflags & IO_ISAIO))

		ret = wait_on_sync_kiocb(iocb);



	isize = i_size_read(inode);

	if (unlikely(ret < 0 && ret != -EFAULT && *offset > isize))

		*offset = isize;

fs/xfs/linux-2.6/xfs_vnode.h

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ struct attrlist_cursor_kern; 
/*

 * Flags for read/write calls - same values as IRIX

 */

#define IO_ISAIO	0x00001		/* don't wait for completion */

#define IO_ISDIRECT	0x00004		/* bypass page cache */

#define IO_INVIS	0x00020		/* don't update inode timestamps */

CRA Git | Maintained and supported by SUSTech CRA and CCSE