---

yaml --- r: 276587 b: refs/heads/master c: 52c6415 h: refs/heads/master i: 276585: 85124b7 276583: 318c325 v: v3
git-mirror · Dec 8, 2011 · 3d71399 · 3d71399
1 parent 27c5a4b
commit 3d71399
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af8a24347f966ab9fae6b0f127d1fbc9d6932d3a
+refs/heads/master: 52c64152a935e63d9ff73ce823730c9a23dedbff
diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c
@@ -2546,7 +2546,8 @@ state_show(struct md_rdev *rdev, char *page)
 		sep = ",";
 	}
 	if (test_bit(Blocked, &rdev->flags) ||
-	    rdev->badblocks.unacked_exist) {
+	    (rdev->badblocks.unacked_exist
+	     && !test_bit(Faulty, &rdev->flags))) {
 		len += sprintf(page+len, "%sblocked", sep);
 		sep = ",";
 	}