Skip to content

Commit a0c7cce

Browse files
Christoph Hellwigtytso
authored andcommitted
ext4: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method
Since commit a2ad63d ("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. Signed-off-by: Christoph Hellwig <hch@lst.de> [RH: Rebased to upstream] Signed-off-by: Ritesh Harjani (IBM) <ritesh.list@gmail.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/e5797bb597219a49043e53e4e90aa494b97dc328.1709215665.git.ritesh.list@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
1 parent 53c17fe commit a0c7cce

2 files changed

Lines changed: 1 addition & 5 deletions

File tree

fs/ext4/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -886,7 +886,7 @@ static int ext4_file_open(struct inode *inode, struct file *filp)
886886
}
887887

888888
filp->f_mode |= FMODE_NOWAIT | FMODE_BUF_RASYNC |
889-
FMODE_DIO_PARALLEL_WRITE;
889+
FMODE_DIO_PARALLEL_WRITE | FMODE_CAN_ODIRECT;
890890
return dquot_file_open(inode, filp);
891891
}
892892

fs/ext4/inode.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3530,7 +3530,6 @@ static const struct address_space_operations ext4_aops = {
35303530
.bmap = ext4_bmap,
35313531
.invalidate_folio = ext4_invalidate_folio,
35323532
.release_folio = ext4_release_folio,
3533-
.direct_IO = noop_direct_IO,
35343533
.migrate_folio = buffer_migrate_folio,
35353534
.is_partially_uptodate = block_is_partially_uptodate,
35363535
.error_remove_folio = generic_error_remove_folio,
@@ -3547,7 +3546,6 @@ static const struct address_space_operations ext4_journalled_aops = {
35473546
.bmap = ext4_bmap,
35483547
.invalidate_folio = ext4_journalled_invalidate_folio,
35493548
.release_folio = ext4_release_folio,
3550-
.direct_IO = noop_direct_IO,
35513549
.migrate_folio = buffer_migrate_folio_norefs,
35523550
.is_partially_uptodate = block_is_partially_uptodate,
35533551
.error_remove_folio = generic_error_remove_folio,
@@ -3564,7 +3562,6 @@ static const struct address_space_operations ext4_da_aops = {
35643562
.bmap = ext4_bmap,
35653563
.invalidate_folio = ext4_invalidate_folio,
35663564
.release_folio = ext4_release_folio,
3567-
.direct_IO = noop_direct_IO,
35683565
.migrate_folio = buffer_migrate_folio,
35693566
.is_partially_uptodate = block_is_partially_uptodate,
35703567
.error_remove_folio = generic_error_remove_folio,
@@ -3573,7 +3570,6 @@ static const struct address_space_operations ext4_da_aops = {
35733570

35743571
static const struct address_space_operations ext4_dax_aops = {
35753572
.writepages = ext4_dax_writepages,
3576-
.direct_IO = noop_direct_IO,
35773573
.dirty_folio = noop_dirty_folio,
35783574
.bmap = ext4_bmap,
35793575
.swap_activate = ext4_iomap_swap_activate,

0 commit comments

Comments
 (0)