@@ -1592,6 +1592,7 @@ static const match_table_t tokens = {
1592
1592
{Opt_auto_da_alloc , "auto_da_alloc" },
1593
1593
{Opt_noauto_da_alloc , "noauto_da_alloc" },
1594
1594
{Opt_dioread_nolock , "dioread_nolock" },
1595
+ {Opt_dioread_lock , "nodioread_nolock" },
1595
1596
{Opt_dioread_lock , "dioread_lock" },
1596
1597
{Opt_discard , "discard" },
1597
1598
{Opt_nodiscard , "nodiscard" },
@@ -3764,6 +3765,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3764
3765
set_opt (sb , NO_UID32 );
3765
3766
/* xattr user namespace & acls are now defaulted on */
3766
3767
set_opt (sb , XATTR_USER );
3768
+ set_opt (sb , DIOREAD_NOLOCK );
3767
3769
#ifdef CONFIG_EXT4_FS_POSIX_ACL
3768
3770
set_opt (sb , POSIX_ACL );
3769
3771
#endif
@@ -3931,9 +3933,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
3931
3933
#endif
3932
3934
3933
3935
if (test_opt (sb , DATA_FLAGS ) == EXT4_MOUNT_JOURNAL_DATA ) {
3934
- printk_once (KERN_WARNING "EXT4-fs: Warning: mounting "
3935
- "with data=journal disables delayed "
3936
- "allocation and O_DIRECT support!\n" );
3936
+ printk_once (KERN_WARNING "EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, and O_DIRECT support!\n" );
3937
+ clear_opt (sb , DIOREAD_NOLOCK );
3937
3938
if (test_opt2 (sb , EXPLICIT_DELALLOC )) {
3938
3939
ext4_msg (sb , KERN_ERR , "can't mount with "
3939
3940
"both data=journal and delalloc" );
0 commit comments