Skip to content

Commit 3e90417

Browse files
riteshharjanijankara
authored andcommitted
ext2: 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: Ritesh Harjani (IBM) <[email protected]> Signed-off-by: Jan Kara <[email protected]> Message-Id: <94f78492f55c3f421359fb6e0d8fab6e79ea17b2.1709215665.git.ritesh.list@gmail.com>
1 parent 94755a0 commit 3e90417

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

fs/ext2/file.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,12 @@ static ssize_t ext2_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
302302
return generic_file_write_iter(iocb, from);
303303
}
304304

305+
static int ext2_file_open(struct inode *inode, struct file *filp)
306+
{
307+
filp->f_mode |= FMODE_CAN_ODIRECT;
308+
return dquot_file_open(inode, filp);
309+
}
310+
305311
const struct file_operations ext2_file_operations = {
306312
.llseek = generic_file_llseek,
307313
.read_iter = ext2_file_read_iter,
@@ -311,7 +317,7 @@ const struct file_operations ext2_file_operations = {
311317
.compat_ioctl = ext2_compat_ioctl,
312318
#endif
313319
.mmap = ext2_file_mmap,
314-
.open = dquot_file_open,
320+
.open = ext2_file_open,
315321
.release = ext2_release_file,
316322
.fsync = ext2_fsync,
317323
.get_unmapped_area = thp_get_unmapped_area,

fs/ext2/inode.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,6 @@ const struct address_space_operations ext2_aops = {
965965
.write_begin = ext2_write_begin,
966966
.write_end = ext2_write_end,
967967
.bmap = ext2_bmap,
968-
.direct_IO = noop_direct_IO,
969968
.writepages = ext2_writepages,
970969
.migrate_folio = buffer_migrate_folio,
971970
.is_partially_uptodate = block_is_partially_uptodate,
@@ -974,7 +973,6 @@ const struct address_space_operations ext2_aops = {
974973

975974
static const struct address_space_operations ext2_dax_aops = {
976975
.writepages = ext2_dax_writepages,
977-
.direct_IO = noop_direct_IO,
978976
.dirty_folio = noop_dirty_folio,
979977
};
980978

0 commit comments

Comments
 (0)