From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 7 Jan 2019 15:06:53 +0000 (+0100)
Subject: drop broken 4.9 patch
X-Git-Tag: v4.9.149~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72c697518f5b5acb5b38137c76de2cb17865c83c;p=thirdparty%2Fkernel%2Fstable-queue.git

drop broken 4.9 patch
---

diff --git a/queue-4.9/ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch b/queue-4.9/ext4-check-for-shutdown-and-r-o-file-system-in-ext4_write_inode.patch
deleted file mode 100644
index b5c8e51a40a..00000000000
--- a/queue-4.9/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
-@@ -5014,9 +5014,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");
-@@ -5032,7 +5036,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-4.9/series b/queue-4.9/series
index 7680aee7856..4dabc25820b 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -48,7 +48,6 @@ ext4-missing-unlock-put_page-in-ext4_try_to_write_inline_data.patch
 ext4-fix-ext4_ioc_group_add-ioctl.patch
 ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.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
 spi-bcm2835-fix-race-on-dma-termination.patch
 spi-bcm2835-fix-book-keeping-of-dma-termination.patch
 spi-bcm2835-avoid-finishing-transfer-prematurely-in-irq-mode.patch