drop ext4 patch from 4.9

diff --git a/queue-4.9/ext4-avoid-running-out-of-journal-credits-when-appending-to-an-inline-file.patch b/queue-4.9/ext4-avoid-running-out-of-journal-credits-when-appending-to-an-inline-file.patch
deleted file mode 100644 (file)
index 148427e..0000000
--- a/queue-4.9/ext4-avoid-running-out-of-journal-credits-when-appending-to-an-inline-file.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 8bc1379b82b8e809eef77a9fedbb75c6c297be19 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Sat, 16 Jun 2018 23:41:59 -0400
-Subject: ext4: avoid running out of journal credits when appending to an inline file
-
-From: Theodore Ts'o <tytso@mit.edu>
-
-commit 8bc1379b82b8e809eef77a9fedbb75c6c297be19 upstream.
-
-Use a separate journal transaction if it turns out that we need to
-convert an inline file to use an data block.  Otherwise we could end
-up failing due to not having journal credits.
-
-This addresses CVE-2018-10883.
-
-https://bugzilla.kernel.org/show_bug.cgi?id=200071
-
-Change-Id: Ifbe92e379f7a25fb252a2584356ccb91f902ea8f
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Cc: stable@kernel.org
-[fengc@google.com: 4.4 and 4.9 backport: adjust context]
-Signed-off-by: Chenbo Feng <fengc@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ext4.h   |  3 ---
- fs/ext4/inline.c | 38 +-------------------------------------
- fs/ext4/xattr.c  | 18 ++----------------
- 3 files changed, 3 insertions(+), 56 deletions(-)
-
-diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
-index 43e27d8ec770..567a6c7af677 100644
---- a/fs/ext4/ext4.h
-+++ b/fs/ext4/ext4.h
-@@ -3038,9 +3038,6 @@ extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode,
- extern int ext4_inline_data_fiemap(struct inode *inode,
-                                  struct fiemap_extent_info *fieinfo,
-                                  int *has_inline, __u64 start, __u64 len);
--extern int ext4_try_to_evict_inline_data(handle_t *handle,
--                                       struct inode *inode,
--                                       int needed);
- extern void ext4_inline_data_truncate(struct inode *inode, int *has_inline);
- 
- extern int ext4_convert_inline_data(struct inode *inode);
-diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
-index 211539a7adfc..6779a9f1de3b 100644
---- a/fs/ext4/inline.c
-+++ b/fs/ext4/inline.c
-@@ -889,11 +889,11 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
-       flags |= AOP_FLAG_NOFS;
- 
-       if (ret == -ENOSPC) {
-+              ext4_journal_stop(handle);
-               ret = ext4_da_convert_inline_data_to_extent(mapping,
-                                                           inode,
-                                                           flags,
-                                                           fsdata);
--              ext4_journal_stop(handle);
-               if (ret == -ENOSPC &&
-                   ext4_should_retry_alloc(inode->i_sb, &retries))
-                       goto retry_journal;
-@@ -1865,42 +1865,6 @@ int ext4_inline_data_fiemap(struct inode *inode,
-       return (error < 0 ? error : 0);
- }
- 
--/*
-- * Called during xattr set, and if we can sparse space 'needed',
-- * just create the extent tree evict the data to the outer block.
-- *
-- * We use jbd2 instead of page cache to move data to the 1st block
-- * so that the whole transaction can be committed as a whole and
-- * the data isn't lost because of the delayed page cache write.
-- */
--int ext4_try_to_evict_inline_data(handle_t *handle,
--                                struct inode *inode,
--                                int needed)
--{
--      int error;
--      struct ext4_xattr_entry *entry;
--      struct ext4_inode *raw_inode;
--      struct ext4_iloc iloc;
--
--      error = ext4_get_inode_loc(inode, &iloc);
--      if (error)
--              return error;
--
--      raw_inode = ext4_raw_inode(&iloc);
--      entry = (struct ext4_xattr_entry *)((void *)raw_inode +
--                                          EXT4_I(inode)->i_inline_off);
--      if (EXT4_XATTR_LEN(entry->e_name_len) +
--          EXT4_XATTR_SIZE(le32_to_cpu(entry->e_value_size)) < needed) {
--              error = -ENOSPC;
--              goto out;
--      }
--
--      error = ext4_convert_inline_data_nolock(handle, inode, &iloc);
--out:
--      brelse(iloc.bh);
--      return error;
--}
--
- void ext4_inline_data_truncate(struct inode *inode, int *has_inline)
- {
-       handle_t *handle;
-diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
-index c19c96840480..3b402c86565a 100644
---- a/fs/ext4/xattr.c
-+++ b/fs/ext4/xattr.c
-@@ -1080,22 +1080,8 @@ int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode,
-       if (EXT4_I(inode)->i_extra_isize == 0)
-               return -ENOSPC;
-       error = ext4_xattr_set_entry(i, s);
--      if (error) {
--              if (error == -ENOSPC &&
--                  ext4_has_inline_data(inode)) {
--                      error = ext4_try_to_evict_inline_data(handle, inode,
--                                      EXT4_XATTR_LEN(strlen(i->name) +
--                                      EXT4_XATTR_SIZE(i->value_len)));
--                      if (error)
--                              return error;
--                      error = ext4_xattr_ibody_find(inode, i, is);
--                      if (error)
--                              return error;
--                      error = ext4_xattr_set_entry(i, s);
--              }
--              if (error)
--                      return error;
--      }
-+      if (error)
-+              return error;
-       header = IHDR(inode, ext4_raw_inode(&is->iloc));
-       if (!IS_LAST_ENTRY(s->first)) {
-               header->h_magic = cpu_to_le32(EXT4_XATTR_MAGIC);
--- 
-2.19.0.605.g01d371f741-goog
-

diff --git a/queue-4.9/series b/queue-4.9/series
index ef6a1ddee1dff39bf8d72ffd1119c7e8dfe1b0e1..bc42a52a6dd052cbad0d6d390ee69e6f0dbdcf28 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -19,4 +19,3 @@ perf-script-python-fix-export-to-postgresql.py-occasional-failure.patch
 mm-preserve-_page_devmap-across-mprotect-calls.patch
 i2c-i2c-scmi-fix-for-i2c_smbus_write_block_data.patch
 xhci-don-t-print-a-warning-when-setting-link-state-for-disabled-ports.patch
-ext4-avoid-running-out-of-journal-credits-when-appending-to-an-inline-file.patch