drop broken ext4 patch from 3.18, 4.4, and 4.9

diff --git a/queue-3.18/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch b/queue-3.18/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
deleted file mode 100644 (file)
index e142af2..0000000
--- a/queue-3.18/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 95cb67138746451cc84cf8e516e14989746e93b0 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 31 Dec 2018 00:11:07 -0500
-Subject: ext4: track writeback errors using the generic tracking infrastructure
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 95cb67138746451cc84cf8e516e14989746e93b0 upstream.
-
-We already using mapping_set_error() in fs/ext4/page_io.c, so all we
-need to do is to use file_check_and_advance_wb_err() when handling
-fsync() requests in ext4_sync_file().
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/fsync.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/fs/ext4/fsync.c
-+++ b/fs/ext4/fsync.c
-@@ -146,6 +146,9 @@ int ext4_sync_file(struct file *file, lo
-                       ret = err;
-       }
- out:
-+      err = file_check_and_advance_wb_err(file);
-+      if (ret == 0)
-+              ret = err;
-       trace_ext4_sync_file_exit(inode, ret);
-       return ret;
- }

diff --git a/queue-3.18/series b/queue-3.18/series
index 35dbcfda36fe34f7d1f8603d1d2961c28e57f0c2..47a09b88853b363ee0ca8ba55b199244544b5aad 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -8,4 +8,3 @@ slab-alien-caches-must-not-be-initialized-if-the-allocation-of-the-alien-cache-f
 acpi-power-skip-duplicate-power-resource-references-in-_prx.patch
 i2c-dev-prevent-adapter-retries-and-timeout-being-set-as-minus-value.patch
 crypto-cts-fix-crash-on-short-inputs.patch
-ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch

diff --git a/queue-4.4/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch b/queue-4.4/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
deleted file mode 100644 (file)
index 4ca829b..0000000
--- a/queue-4.4/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 95cb67138746451cc84cf8e516e14989746e93b0 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 31 Dec 2018 00:11:07 -0500
-Subject: ext4: track writeback errors using the generic tracking infrastructure
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 95cb67138746451cc84cf8e516e14989746e93b0 upstream.
-
-We already using mapping_set_error() in fs/ext4/page_io.c, so all we
-need to do is to use file_check_and_advance_wb_err() when handling
-fsync() requests in ext4_sync_file().
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/fsync.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/fs/ext4/fsync.c
-+++ b/fs/ext4/fsync.c
-@@ -145,6 +145,9 @@ int ext4_sync_file(struct file *file, lo
-                       ret = err;
-       }
- out:
-+      err = file_check_and_advance_wb_err(file);
-+      if (ret == 0)
-+              ret = err;
-       trace_ext4_sync_file_exit(inode, ret);
-       return ret;
- }

diff --git a/queue-4.4/series b/queue-4.4/series
index 68fc4bd11b849bddbdbfebd35a3ac1dd261044a2..fd9b11f5fea69a0d29d336d3b2c6368a3ffc6c19 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -50,4 +50,3 @@ crypto-cts-fix-crash-on-short-inputs.patch
 drm-amdgpu-validate-user-pitch-alignment.patch
 drm-amdgpu-validate-user-gem-object-size.patch
 ext4-fix-a-potential-fiemap-page-fault-deadlock-w-inline_data.patch
-ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch

diff --git a/queue-4.9/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch b/queue-4.9/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
deleted file mode 100644 (file)
index c046b89..0000000
--- a/queue-4.9/ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 95cb67138746451cc84cf8e516e14989746e93b0 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Mon, 31 Dec 2018 00:11:07 -0500
-Subject: ext4: track writeback errors using the generic tracking infrastructure
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 95cb67138746451cc84cf8e516e14989746e93b0 upstream.
-
-We already using mapping_set_error() in fs/ext4/page_io.c, so all we
-need to do is to use file_check_and_advance_wb_err() when handling
-fsync() requests in ext4_sync_file().
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/fsync.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/fs/ext4/fsync.c
-+++ b/fs/ext4/fsync.c
-@@ -155,6 +155,9 @@ int ext4_sync_file(struct file *file, lo
-                       ret = err;
-       }
- out:
-+      err = file_check_and_advance_wb_err(file);
-+      if (ret == 0)
-+              ret = err;
-       trace_ext4_sync_file_exit(inode, ret);
-       return ret;
- }

diff --git a/queue-4.9/series b/queue-4.9/series
index 465ed186492fa3e8534eef75c506cc21817c5f7a..2a02c6d4becd589a016466cb02170e0f0d4a4fef 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -15,4 +15,3 @@ rbd-don-t-return-0-on-unmap-if-rbd_dev_flag_removing-is-set.patch
 ext4-make-sure-enough-credits-are-reserved-for-dioread_nolock-writes.patch
 ext4-fix-a-potential-fiemap-page-fault-deadlock-w-inline_data.patch
 ext4-avoid-kernel-warning-when-writing-the-superblock-to-a-dead-device.patch
-ext4-track-writeback-errors-using-the-generic-tracking-infrastructure.patch