remove queue-3.4/ext4-fix-partial-cluster-handling-for-bigalloc-file-systems.patch

diff --git a/queue-3.4/ext4-fix-partial-cluster-handling-for-bigalloc-file-systems.patch b/queue-3.4/ext4-fix-partial-cluster-handling-for-bigalloc-file-systems.patch
deleted file mode 100644 (file)
index 5b104ec..0000000
--- a/queue-3.4/ext4-fix-partial-cluster-handling-for-bigalloc-file-systems.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c06344939422bbd032ac967223a7863de57496b5 Mon Sep 17 00:00:00 2001
-From: Eric Whitney <enwlinux@gmail.com>
-Date: Thu, 13 Mar 2014 23:34:16 -0400
-Subject: ext4: fix partial cluster handling for bigalloc file systems
-
-From: Eric Whitney <enwlinux@gmail.com>
-
-commit c06344939422bbd032ac967223a7863de57496b5 upstream.
-
-Commit 9cb00419fa, which enables hole punching for bigalloc file
-systems, exposed a bug introduced by commit 6ae06ff51e in an earlier
-release.  When run on a bigalloc file system, xfstests generic/013, 068,
-075, 083, 091, 100, 112, 127, 263, 269, and 270 fail with e2fsck errors
-or cause kernel error messages indicating that previously freed blocks
-are being freed again.
-
-The latter commit optimizes the selection of the starting extent in
-ext4_ext_rm_leaf() when hole punching by beginning with the extent
-supplied in the path argument rather than with the last extent in the
-leaf node (as is still done when truncating).  However, the code in
-rm_leaf that initially sets partial_cluster to track cluster sharing on
-extent boundaries is only guaranteed to run if rm_leaf starts with the
-last node in the leaf.  Consequently, partial_cluster is not correctly
-initialized when hole punching, and a cluster on the boundary of a
-punched region that should be retained may instead be deallocated.
-
-Signed-off-by: Eric Whitney <enwlinux@gmail.com>
-Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/ext4/extents.c |   21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
---- a/fs/ext4/extents.c
-+++ b/fs/ext4/extents.c
-@@ -2372,6 +2372,27 @@ ext4_ext_rm_leaf(handle_t *handle, struc
-       ex_ee_block = le32_to_cpu(ex->ee_block);
-       ex_ee_len = ext4_ext_get_actual_len(ex);
- 
-+      /*
-+       * If we're starting with an extent other than the last one in the
-+       * node, we need to see if it shares a cluster with the extent to
-+       * the right (towards the end of the file). If its leftmost cluster
-+       * is this extent's rightmost cluster and it is not cluster aligned,
-+       * we'll mark it as a partial that is not to be deallocated.
-+       */
-+
-+      if (ex != EXT_LAST_EXTENT(eh)) {
-+              ext4_fsblk_t current_pblk, right_pblk;
-+              long long current_cluster, right_cluster;
-+
-+              current_pblk = ext4_ext_pblock(ex) + ex_ee_len - 1;
-+              current_cluster = (long long)EXT4_B2C(sbi, current_pblk);
-+              right_pblk = ext4_ext_pblock(ex + 1);
-+              right_cluster = (long long)EXT4_B2C(sbi, right_pblk);
-+              if (current_cluster == right_cluster &&
-+                      EXT4_PBLK_COFF(sbi, right_pblk))
-+                      *partial_cluster = -right_cluster;
-+      }
-+
-       trace_ext4_ext_rm_leaf(inode, start, ex, *partial_cluster);
- 
-       while (ex >= EXT_FIRST_EXTENT(eh) &&

diff --git a/queue-3.4/series b/queue-3.4/series
index 17e28653faaf9990b3a1f46842254c8a82787c78..fd30a77c46675af8af3f6da5532b34d667972dd7 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -20,7 +20,6 @@ sparc32-fix-build-failure-for-arch_jump_label_transform.patch
 sparc64-don-t-treat-64-bit-syscall-return-codes-as-32-bit.patch
 char-ipmi_bt_sm-fix-infinite-loop.patch
 bluetooth-fix-removing-long-term-key.patch
-ext4-fix-partial-cluster-handling-for-bigalloc-file-systems.patch
 jffs2-fix-segmentation-fault-found-in-stress-test.patch
 jffs2-fix-crash-due-to-truncation-of-csize.patch
 jffs2-avoid-soft-lockup-in-jffs2_reserve_space_gc.patch