Revert "ext4: make dioread_nolock the default"

This reverts commit 1e82b7ed214e1c924ab94521e25a179eeb4e80e6.

BUG=b/156407116
TESTED=ran xfstests smoke to verify no regressions

Change-Id: I5c12c3c8a8ad6301a64753e59b15193275dee04c
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/1900
Reviewed-by: Vaibhav Rustagi <vaibhavrustagi@google.com>
(cherry picked from commit f8649a7408c63f53937e33b0e8379679b0434849)
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/1940
Reviewed-by: Roy Yang <royyang@google.com>

fs/ext4/super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 32197b5..369d1d0 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1537,7 +1537,6 @@ static const match_table_t tokens = {
 	{Opt_auto_da_alloc, "auto_da_alloc"},
 	{Opt_noauto_da_alloc, "noauto_da_alloc"},
 	{Opt_dioread_nolock, "dioread_nolock"},
-	{Opt_dioread_lock, "nodioread_nolock"},
 	{Opt_dioread_lock, "dioread_lock"},
 	{Opt_discard, "discard"},
 	{Opt_nodiscard, "nodiscard"},
@@ -3690,7 +3689,6 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		set_opt(sb, NO_UID32);
 	/* xattr user namespace & acls are now defaulted on */
 	set_opt(sb, XATTR_USER);
-	set_opt(sb, DIOREAD_NOLOCK);
 #ifdef CONFIG_EXT4_FS_POSIX_ACL
 	set_opt(sb, POSIX_ACL);
 #endif
@@ -3828,8 +3826,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
 		goto failed_mount;
 
 	if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) {
-		printk_once(KERN_WARNING "EXT4-fs: Warning: mounting with data=journal disables delayed allocation, dioread_nolock, and O_DIRECT support!\n");
-		clear_opt(sb, DIOREAD_NOLOCK);
+		printk_once(KERN_WARNING "EXT4-fs: Warning: mounting "
+			    "with data=journal disables delayed "
+			    "allocation and O_DIRECT support!\n");
 		if (test_opt2(sb, EXPLICIT_DELALLOC)) {
 			ext4_msg(sb, KERN_ERR, "can't mount with "
 				 "both data=journal and delalloc");