Drop ext4-make-dioread_nolock-the-default.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/ext4-make-dioread_nolock-the-default.patch b/queue-4.14/ext4-make-dioread_nolock-the-default.patch
deleted file mode 100644 (file)
index 3dc0318..0000000
--- a/queue-4.14/ext4-make-dioread_nolock-the-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From bd8779cd54992a61ef4a37dcac53a0ab486e2179 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 23 Jan 2020 12:23:17 -0500
-Subject: ext4: make dioread_nolock the default
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-[ Upstream commit 244adf6426ee31a83f397b700d964cff12a247d3 ]
-
-This fixes the direct I/O versus writeback race which can reveal stale
-data, and it improves the tail latency of commits on slow devices.
-
-Link: https://lore.kernel.org/r/20200125022254.1101588-1-tytso@mit.edu
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/ext4/super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 634c822d1dc98..74516e7fa80f1 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1471,6 +1471,7 @@ 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"},
-@@ -3633,6 +3634,7 @@ 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
-@@ -3770,9 +3772,8 @@ 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 and O_DIRECT support!\n");
-+              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);
-               if (test_opt2(sb, EXPLICIT_DELALLOC)) {
-                       ext4_msg(sb, KERN_ERR, "can't mount with "
-                                "both data=journal and delalloc");
--- 
-2.25.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index b875c9df41507b5bdf06480e98e43daf678d99b9..37ea70d26bcdfeb31c5df890fd6049b04f479f7b 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -48,7 +48,6 @@ acpi-ec-reference-count-query-handlers-under-lock.patch
 dmaengine-zynqmp_dma-fix-burst-length-configuration.patch
 powerpc-eeh-only-dump-stack-once-if-an-mmio-loop-is-.patch
 tracing-set-kernel_stack-s-caller-size-properly.patch
-ext4-make-dioread_nolock-the-default.patch
 ar5523-add-usb-id-of-smcwusbt-g2-wireless-adapter.patch
 selftests-ftrace-fix-glob-selftest.patch
 tools-power-x86-intel_pstate_tracer-changes-for-pyth.patch

diff --git a/queue-4.19/ext4-make-dioread_nolock-the-default.patch b/queue-4.19/ext4-make-dioread_nolock-the-default.patch
deleted file mode 100644 (file)
index 74a3935..0000000
--- a/queue-4.19/ext4-make-dioread_nolock-the-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d9bd15972dbb74482fb7697e11aa3c39db682ded Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 23 Jan 2020 12:23:17 -0500
-Subject: ext4: make dioread_nolock the default
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-[ Upstream commit 244adf6426ee31a83f397b700d964cff12a247d3 ]
-
-This fixes the direct I/O versus writeback race which can reveal stale
-data, and it improves the tail latency of commits on slow devices.
-
-Link: https://lore.kernel.org/r/20200125022254.1101588-1-tytso@mit.edu
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/ext4/super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 0c15ff19acbd4..0076ea7427e34 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1538,6 +1538,7 @@ 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"},
-@@ -3712,6 +3713,7 @@ 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
-@@ -3849,9 +3851,8 @@ 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 and O_DIRECT support!\n");
-+              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);
-               if (test_opt2(sb, EXPLICIT_DELALLOC)) {
-                       ext4_msg(sb, KERN_ERR, "can't mount with "
-                                "both data=journal and delalloc");
--- 
-2.25.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 8eaee54adc627b2d80807b90ac1047ca430a6ed7..9691d2e156414a7e1a8d8d1255b3788f0b7ac767 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -58,7 +58,6 @@ s390-cpum_sf-use-kzalloc-and-minor-changes.patch
 powerpc-eeh-only-dump-stack-once-if-an-mmio-loop-is-.patch
 bluetooth-btrtl-use-kvmalloc-for-fw-allocations.patch
 tracing-set-kernel_stack-s-caller-size-properly.patch
-ext4-make-dioread_nolock-the-default.patch
 arm-8948-1-prevent-oob-access-in-stacktrace.patch
 ar5523-add-usb-id-of-smcwusbt-g2-wireless-adapter.patch
 ceph-ensure-we-have-a-new-cap-before-continuing-in-f.patch

diff --git a/queue-4.4/ext4-make-dioread_nolock-the-default.patch b/queue-4.4/ext4-make-dioread_nolock-the-default.patch
deleted file mode 100644 (file)
index 0c3bb2e..0000000
--- a/queue-4.4/ext4-make-dioread_nolock-the-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From f1abc231226fc15da88d47a87a2dfbf6d7a486f1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 23 Jan 2020 12:23:17 -0500
-Subject: ext4: make dioread_nolock the default
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-[ Upstream commit 244adf6426ee31a83f397b700d964cff12a247d3 ]
-
-This fixes the direct I/O versus writeback race which can reveal stale
-data, and it improves the tail latency of commits on slow devices.
-
-Link: https://lore.kernel.org/r/20200125022254.1101588-1-tytso@mit.edu
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/ext4/super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index aca086a25b2ef..5a623ea954882 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1251,6 +1251,7 @@ 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"},
-@@ -3380,6 +3381,7 @@ 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
-@@ -3448,9 +3450,8 @@ 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 and O_DIRECT support!\n");
-+              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);
-               if (test_opt2(sb, EXPLICIT_DELALLOC)) {
-                       ext4_msg(sb, KERN_ERR, "can't mount with "
-                                "both data=journal and delalloc");
--- 
-2.25.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index 278f695191987270a22724333180834bf69feca7..688662f4475953dfbdecb4035efb1fbc39b5a261 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -25,7 +25,6 @@ rt_cpu_seq_next-should-increase-position-index.patch
 seqlock-require-write_once-surrounding-raw_seqcount_.patch
 acpi-ec-reference-count-query-handlers-under-lock.patch
 tracing-set-kernel_stack-s-caller-size-properly.patch
-ext4-make-dioread_nolock-the-default.patch
 ar5523-add-usb-id-of-smcwusbt-g2-wireless-adapter.patch
 bluetooth-fix-refcount-use-after-free-issue.patch
 mm-pagewalk-fix-termination-condition-in-walk_pte_ra.patch

diff --git a/queue-4.9/ext4-make-dioread_nolock-the-default.patch b/queue-4.9/ext4-make-dioread_nolock-the-default.patch
deleted file mode 100644 (file)
index 429bf02..0000000
--- a/queue-4.9/ext4-make-dioread_nolock-the-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 0d0769c52abf72aab1318637b331f2a89d0a2098 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 23 Jan 2020 12:23:17 -0500
-Subject: ext4: make dioread_nolock the default
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-[ Upstream commit 244adf6426ee31a83f397b700d964cff12a247d3 ]
-
-This fixes the direct I/O versus writeback race which can reveal stale
-data, and it improves the tail latency of commits on slow devices.
-
-Link: https://lore.kernel.org/r/20200125022254.1101588-1-tytso@mit.edu
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/ext4/super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 472fa29c6f604..b1fd544929f7e 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1367,6 +1367,7 @@ 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"},
-@@ -3548,6 +3549,7 @@ 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
-@@ -3616,9 +3618,8 @@ 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 and O_DIRECT support!\n");
-+              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);
-               if (test_opt2(sb, EXPLICIT_DELALLOC)) {
-                       ext4_msg(sb, KERN_ERR, "can't mount with "
-                                "both data=journal and delalloc");
--- 
-2.25.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 81a8025c48f986afbdad822547a5d6e1344bdf6f..d316aa145948fb771b9070c65b428f78c74b58f2 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -35,7 +35,6 @@ media-ti-vpe-cal-restrict-dma-to-avoid-memory-corrup.patch
 acpi-ec-reference-count-query-handlers-under-lock.patch
 dmaengine-zynqmp_dma-fix-burst-length-configuration.patch
 tracing-set-kernel_stack-s-caller-size-properly.patch
-ext4-make-dioread_nolock-the-default.patch
 ar5523-add-usb-id-of-smcwusbt-g2-wireless-adapter.patch
 bluetooth-fix-refcount-use-after-free-issue.patch
 mm-pagewalk-fix-termination-condition-in-walk_pte_ra.patch

diff --git a/queue-5.4/ext4-make-dioread_nolock-the-default.patch b/queue-5.4/ext4-make-dioread_nolock-the-default.patch
deleted file mode 100644 (file)
index 1c47626..0000000
--- a/queue-5.4/ext4-make-dioread_nolock-the-default.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d7764af3e6cac6719b6af19ac535fdeab79576cb Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 23 Jan 2020 12:23:17 -0500
-Subject: ext4: make dioread_nolock the default
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-[ Upstream commit 244adf6426ee31a83f397b700d964cff12a247d3 ]
-
-This fixes the direct I/O versus writeback race which can reveal stale
-data, and it improves the tail latency of commits on slow devices.
-
-Link: https://lore.kernel.org/r/20200125022254.1101588-1-tytso@mit.edu
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/ext4/super.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/fs/ext4/super.c b/fs/ext4/super.c
-index 4aae7e3e89a12..c32b8161ad3e9 100644
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -1546,6 +1546,7 @@ 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"},
-@@ -3750,6 +3751,7 @@ 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
-@@ -3927,9 +3929,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
- #endif
- 
-       if (test_opt(sb, DATA_FLAGS) == EXT4_MOUNT_JOURNAL_DATA) {
--              printk_once(KERN_WARNING "EXT4-fs: Warning: mounting "
--                          "with data=journal disables delayed "
--                          "allocation and O_DIRECT support!\n");
-+              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);
-               if (test_opt2(sb, EXPLICIT_DELALLOC)) {
-                       ext4_msg(sb, KERN_ERR, "can't mount with "
-                                "both data=journal and delalloc");
--- 
-2.25.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 9dcf98e6d9b981fdcbe5dfa7a30b293e1d043f9c..f56ca31ef5391ba8b376f44b701212a9f3983971 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -97,7 +97,6 @@ nfsd-fix-a-soft-lockup-race-in-nfsd_file_mark_find_o.patch
 powerpc-eeh-only-dump-stack-once-if-an-mmio-loop-is-.patch
 bluetooth-btrtl-use-kvmalloc-for-fw-allocations.patch
 tracing-set-kernel_stack-s-caller-size-properly.patch
-ext4-make-dioread_nolock-the-default.patch
 arm-8948-1-prevent-oob-access-in-stacktrace.patch
 ar5523-add-usb-id-of-smcwusbt-g2-wireless-adapter.patch
 ceph-ensure-we-have-a-new-cap-before-continuing-in-f.patch