---

yaml --- r: 276590 b: refs/heads/master c: 5d8c71f h: refs/heads/master v: v3
git-mirror · Dec 9, 2011 · 9d41000 · 9d41000
1 parent 73bfdfd
commit 9d41000
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9283d8c5af4cdcb809e655acdf4be368afec8b58
+refs/heads/master: 5d8c71f9e5fbdd95650be00294d238e27a363b5c
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -3070,15 +3070,15 @@ static void analyse_stripe(struct stripe_head *sh, struct stripe_head_state *s)
 			if (sh->sector + STRIPE_SECTORS <= rdev->recovery_offset)
 				set_bit(R5_Insync, &dev->flags);
 		}
-		if (test_bit(R5_WriteError, &dev->flags)) {
+		if (rdev && test_bit(R5_WriteError, &dev->flags)) {
 			clear_bit(R5_Insync, &dev->flags);
 			if (!test_bit(Faulty, &rdev->flags)) {
 				s->handle_bad_blocks = 1;
 				atomic_inc(&rdev->nr_pending);
 			} else
 				clear_bit(R5_WriteError, &dev->flags);
 		}
-		if (test_bit(R5_MadeGood, &dev->flags)) {
+		if (rdev && test_bit(R5_MadeGood, &dev->flags)) {
 			if (!test_bit(Faulty, &rdev->flags)) {
 				s->handle_bad_blocks = 1;
 				atomic_inc(&rdev->nr_pending);