---

yaml --- r: 311563 b: refs/heads/master c: f456309 h: refs/heads/master i: 311561: f7be087 311559: e52ab20 v: v3
git-mirror · Jul 3, 2012 · e5d23e7 · e5d23e7
1 parent 0bd70b8
commit e5d23e7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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.
 			 */