From a29b9c99738f166512acf27fcd56fc9abe8b86f5 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Wed, 11 May 2011 14:26:20 +1000
Subject: [PATCH] --- yaml --- r: 247870 b: refs/heads/master c:
 bedd86b7773fd97f0d708cc0c371c8963ba7ba9a h: refs/heads/master v: v3

---
 [refs]                |  2 +-
 trunk/drivers/md/md.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fc787380c9ad..dafe3cca4861 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b0140891a8cea36469f58d23859e599b1122bd37
+refs/heads/master: bedd86b7773fd97f0d708cc0c371c8963ba7ba9a
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index 4a4c0f80bdeb..5469ae35ee15 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -5216,6 +5216,16 @@ static int add_new_disk(mddev_t * mddev, mdu_disk_info_t *info)
 		} else
 			super_types[mddev->major_version].
 				validate_super(mddev, rdev);
+		if ((info->state & (1<<MD_DISK_SYNC)) &&
+		    (!test_bit(In_sync, &rdev->flags) ||
+		     rdev->raid_disk != info->raid_disk)) {
+			/* This was a hot-add request, but events doesn't
+			 * match, so reject it.
+			 */
+			export_rdev(rdev);
+			return -EINVAL;
+		}
+
 		if (test_bit(In_sync, &rdev->flags))
 			rdev->saved_raid_disk = rdev->raid_disk;
 		else