remove queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-remove...

diff --git a/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch b/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch
deleted file mode 100644 (file)
index 18d3fe3..0000000
--- a/queue-3.0/md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 6dafab6b1383e912cd252fa809570b484eb6e0dc Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Wed, 19 Sep 2012 12:54:22 +1000
-Subject: md: make sure metadata is updated when spares are activated or removed.
-
-From: NeilBrown <neilb@suse.de>
-
-commit 6dafab6b1383e912cd252fa809570b484eb6e0dc upstream.
-
-It isn't always necessary to update the metadata when spares are
-removed as the presence-or-not of a spare isn't really important to
-the integrity of an array.
-Also activating a spare doesn't always require updating the metadata
-as the update on 'recovery-completed' is usually sufficient.
-
-However the introduction of 'replacement' devices have made these
-transitions sometimes more important.  For example the 'Replacement'
-flag isn't cleared until the original device is removed, so we need
-to ensure a metadata update after that 'spare' is removed.
-
-So set MD_CHANGE_DEVS whenever a spare is activated or removed, to
-complement the current situation where it is set when a spare is added
-or a device is failed (or a number of other less common situations).
-
-This is suitable for -stable as out-of-data metadata could lead
-to data corruption.
-This is only relevant for 3.3 and later 9when 'replacement' as
-introduced.
-
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/md/md.c |    8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -7096,6 +7096,7 @@ static int remove_and_add_spares(mddev_t
- {
-       mdk_rdev_t *rdev;
-       int spares = 0;
-+      int removed = 0;
- 
-       mddev->curr_resync_completed = 0;
- 
-@@ -7111,6 +7112,7 @@ static int remove_and_add_spares(mddev_t
-                               sprintf(nm,"rd%d", rdev->raid_disk);
-                               sysfs_remove_link(&mddev->kobj, nm);
-                               rdev->raid_disk = -1;
-+                              removed = 1;
-                       }
-               }
- 
-@@ -7139,6 +7141,8 @@ static int remove_and_add_spares(mddev_t
-                       }
-               }
-       }
-+      if (removed)
-+              set_bit(MD_CHANGE_DEVS, &mddev->flags);
-       return spares;
- }
- 
-@@ -7152,9 +7156,11 @@ static void reap_sync_thread(mddev_t *md
-           !test_bit(MD_RECOVERY_REQUESTED, &mddev->recovery)) {
-               /* success...*/
-               /* activate any spares */
--              if (mddev->pers->spare_active(mddev))
-+              if (mddev->pers->spare_active(mddev)) {
-                       sysfs_notify(&mddev->kobj, NULL,
-                                    "degraded");
-+                      set_bit(MD_CHANGE_DEVS, &mddev->flags);
-+              }
-       }
-       if (test_bit(MD_RECOVERY_RESHAPE, &mddev->recovery) &&
-           mddev->pers->finish_reshape)

diff --git a/queue-3.0/series b/queue-3.0/series
index 58e98ec8e3298253097c450e421cec8d750c23de..74e577cc5428818b507a0ae3b23996ce55a0a8af 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -90,7 +90,6 @@ drm-radeon-kms-extend-the-fujitsu-d3003-s2-board-connector-quirk-to-cover-later-
 asus-laptop-hrws-hwrs-typo.patch
 asus-nb-wmi-add-some-video-toggle-keys.patch
 drm-i915-hdmi-clear-audio-enable-bit-for-hot-plug.patch
-md-make-sure-metadata-is-updated-when-spares-are-activated-or-removed.patch
 workqueue-unbound-rebind-morphing-in-rebind_workers-should-be-atomic.patch
 x86-fix-boot-on-twinhead-h12y.patch
 bluetooth-btusb-add-vendor-specific-id-0a5c-21f4-bcm20702a0.patch