From e5d23e7b59767eca272497c579b999ccda7a8714 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Tue, 3 Jul 2012 15:59:06 +1000
Subject: [PATCH] --- yaml --- r: 311563 b: refs/heads/master c:
 f456309106e9657645c81bce1a6bb3230393564e h: refs/heads/master i:   311561:
 f7be087fa5c50fc85bd3eb5152537e11014022bc   311559:
 e52ab209cd09f5df8e786474f506fe874dee956c v: v3

---
 [refs]                | 2 +-
 trunk/drivers/md/md.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c10dde3ee222..30e28c0cc202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32644afd8975d19174bcb9ba34687c32dd810a09
+refs/heads/master: f456309106e9657645c81bce1a6bb3230393564e
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
index c601c4be77c7..a4c219e3c859 100644
--- a/trunk/drivers/md/md.c
+++ b/trunk/drivers/md/md.c
@@ -5784,8 +5784,7 @@ static int add_new_disk(struct mddev * mddev, mdu_disk_info_t *info)
 			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)) {
+		     rdev->raid_disk != info->raid_disk) {
 			/* This was a hot-add request, but events doesn't
 			 * match, so reject it.
 			 */