delete md patch from .30 queue that would not build

diff --git a/queue-2.6.30/md-handle-growth-of-v1.x-metadata-correctly.patch b/queue-2.6.30/md-handle-growth-of-v1.x-metadata-correctly.patch
deleted file mode 100644 (file)
index e111abc..0000000
--- a/queue-2.6.30/md-handle-growth-of-v1.x-metadata-correctly.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 70471dafe3390243c598a3165dfb86b8b8b3f4fe Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Mon, 3 Aug 2009 10:59:57 +1000
-Subject: md: Handle growth of v1.x metadata correctly.
-
-From: NeilBrown <neilb@suse.de>
-
-commit 70471dafe3390243c598a3165dfb86b8b8b3f4fe upstream.
-
-The v1.x metadata does not have a fixed size and can grow
-when devices are added.
-If it grows enough to require an extra sector of storage,
-we need to update the 'sb_size' to match.
-
-Without this, md can write out an incomplete superblock with a
-bad checksum, which will be rejected when trying to re-assemble
-the array.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/md/md.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -1410,8 +1410,14 @@ static void super_1_sync(mddev_t *mddev,
-               if (rdev2->desc_nr+1 > max_dev)
-                       max_dev = rdev2->desc_nr+1;
- 
--      if (max_dev > le32_to_cpu(sb->max_dev))
-+      if (max_dev > le32_to_cpu(sb->max_dev)) {
-+              int bmask;
-               sb->max_dev = cpu_to_le32(max_dev);
-+              rdev->sb_size = max_dev * 2 + 256;
-+              bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
-+              if (rdev->sb_size & bmask)
-+                      rdev->sb_size = (rdev->sb_size | bmask) + 1;
-+      }
-       for (i=0; i<max_dev;i++)
-               sb->dev_roles[i] = cpu_to_le16(0xfffe);
-       

diff --git a/queue-2.6.30/series b/queue-2.6.30/series
index 8844f080ee026724caa5ddfd0a5308e31783600f..d94ed39c346a0f2f6f5af43d5bb7af9e335a5ee7 100644 (file)
--- a/queue-2.6.30/series
+++ b/queue-2.6.30/series
@@ -41,6 +41,5 @@ x86-fix-assembly-constraints-in-native_save_fl.patch
 x86-pat-fix-set_memory_wc-related-corruption.patch
 md-raid6-release-spare-page-at-stop.patch
 md-when-a-level-change-reduces-the-number-of-devices-remove-the-excess.patch
-md-handle-growth-of-v1.x-metadata-correctly.patch
 ide-fix-handling-of-unexpected-irqs-vs-request_irq.patch
 ide-relax-dma-info-validity-checking.patch