drop 3.18 broken patch

diff --git a/queue-3.18/ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch b/queue-3.18/ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch
deleted file mode 100644 (file)
index ecad153..0000000
--- a/queue-3.18/ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 18f2c4fcebf2582f96cbd5f2238f4f354a0e4847 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Wed, 19 Dec 2018 14:36:58 -0500
-Subject: ext4: check for shutdown and r/o file system in ext4_write_inode()
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 18f2c4fcebf2582f96cbd5f2238f4f354a0e4847 upstream.
-
-If the file system has been shut down or is read-only, then
-ext4_write_inode() needs to bail out early.
-
-Also use jbd2_complete_transaction() instead of ext4_force_commit() so
-we only force a commit if it is needed.
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/inode.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/fs/ext4/inode.c
-+++ b/fs/ext4/inode.c
-@@ -4409,9 +4409,13 @@ int ext4_write_inode(struct inode *inode
- {
-       int err;
- 
--      if (WARN_ON_ONCE(current->flags & PF_MEMALLOC))
-+      if (WARN_ON_ONCE(current->flags & PF_MEMALLOC) ||
-+          sb_rdonly(inode->i_sb))
-               return 0;
- 
-+      if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
-+              return -EIO;
-+
-       if (EXT4_SB(inode->i_sb)->s_journal) {
-               if (ext4_journal_current_handle()) {
-                       jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");
-@@ -4427,7 +4431,8 @@ int ext4_write_inode(struct inode *inode
-               if (wbc->sync_mode != WB_SYNC_ALL || wbc->for_sync)
-                       return 0;
- 
--              err = ext4_force_commit(inode->i_sb);
-+              err = jbd2_complete_transaction(EXT4_SB(inode->i_sb)->s_journal,
-+                                              EXT4_I(inode)->i_sync_tid);
-       } else {
-               struct ext4_iloc iloc;
- 

diff --git a/queue-3.18/series b/queue-3.18/series
index c27efdf447bc6afb2aea5af9678d5dfdb9fce82e..ede5184255217bff0d04a0239b6bc746367a99a8 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -23,5 +23,4 @@ kvm-x86-use-jmp-to-invoke-kvm_spurious_fault-from-.fixup.patch
 ext4-fix-possible-use-after-free-in-ext4_quota_enable.patch
 ext4-missing-unlock-put_page-in-ext4_try_to_write_inline_data.patch
 ext4-force-inode-writes-when-nfsd-calls-commit_metadata.patch
-ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch
 cdc-acm-fix-abnormal-data-rx-issue-for-mediatek-preloader.patch