deleted queue-3.4/md-make-sure-get_array_info-ioctl-reports-correct-clean-status...

diff --git a/queue-3.4/md-make-sure-get_array_info-ioctl-reports-correct-clean-status.patch b/queue-3.4/md-make-sure-get_array_info-ioctl-reports-correct-clean-status.patch
deleted file mode 100644 (file)
index cedb9fc..0000000
--- a/queue-3.4/md-make-sure-get_array_info-ioctl-reports-correct-clean-status.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9bd359203210efeb5d8f0d81c155079f34b47449 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Wed, 2 Jul 2014 11:35:06 +1000
-Subject: md: make sure GET_ARRAY_INFO ioctl reports correct "clean" status
-
-From: NeilBrown <neilb@suse.de>
-
-commit 9bd359203210efeb5d8f0d81c155079f34b47449 upstream.
-
-If an array has a bitmap, the when we set the "has bitmap" flag we
-incorrectly clear the "is clean" flag.
-
-"is clean" isn't really important when a bitmap is present, but it is
-best to get it right anyway.
-
-Reported-by: George Duffield <forumscollective@gmail.com>
-Link: http://lkml.kernel.org/CAG__1a4MRV6gJL38XLAurtoSiD3rLBTmWpcS5HYvPpSfPR88UQ@mail.gmail.com
-Fixes: 36fa30636fb84b209210299684e1be66d9e58217 (v2.6.14)
-Signed-off-by: NeilBrown <neilb@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/md/md.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/md/md.c
-+++ b/drivers/md/md.c
-@@ -5409,7 +5409,7 @@ static int get_array_info(struct mddev *
-       if (mddev->in_sync)
-               info.state = (1<<MD_SB_CLEAN);
-       if (mddev->bitmap && mddev->bitmap_info.offset)
--              info.state = (1<<MD_SB_BITMAP_PRESENT);
-+              info.state |= (1<<MD_SB_BITMAP_PRESENT);
-       info.active_disks  = insync;
-       info.working_disks = working;
-       info.failed_disks  = failed;

diff --git a/queue-3.4/series b/queue-3.4/series
index 2ad6fc23cb568e82df0a3edd2b884c1d88b266a5..a8ccc80c2b670fd70bf217f2460eb2b1c0576080 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -24,4 +24,3 @@ kvm-x86-preserve-the-high-32-bits-of-the-pat-register.patch
 nfsd-fix-rare-symlink-decoding-bug.patch
 tools-ffs-test-fix-header-values-endianess.patch
 md-flush-writes-before-starting-a-recovery.patch
-md-make-sure-get_array_info-ioctl-reports-correct-clean-status.patch