Commit b2943499 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method 



Since commit a2ad63da ("VFS: add FMODE_CAN_ODIRECT file flag") file
systems can just set the FMODE_CAN_ODIRECT flag at open time instead of
wiring up a dummy direct_IO method to indicate support for direct I/O.
Do that for xfs so that noop_direct_IO can eventually be removed.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 61d7e827

fs/xfs/xfs_aops.c

+0 −2
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ const struct address_space_operations xfs_address_space_operations = { 
	.release_folio		= iomap_release_folio,

	.invalidate_folio	= iomap_invalidate_folio,

	.bmap			= xfs_vm_bmap,

	.direct_IO		= noop_direct_IO,

	.migrate_folio		= filemap_migrate_folio,

	.is_partially_uptodate  = iomap_is_partially_uptodate,

	.error_remove_page	= generic_error_remove_page,
@@ -591,7 +590,6 @@ const struct address_space_operations xfs_address_space_operations = { 


const struct address_space_operations xfs_dax_aops = {

	.writepages		= xfs_dax_writepages,

	.direct_IO		= noop_direct_IO,

	.dirty_folio		= noop_dirty_folio,

	.swap_activate		= xfs_iomap_swapfile_activate,

};

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -1172,7 +1172,7 @@ xfs_file_open( 
	if (xfs_is_shutdown(XFS_M(inode->i_sb)))

		return -EIO;

	file->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC | FMODE_BUF_WASYNC |

			FMODE_DIO_PARALLEL_WRITE;

			FMODE_DIO_PARALLEL_WRITE | FMODE_CAN_ODIRECT;

	return generic_file_open(inode, file);

}