---

yaml --- r: 275233 b: refs/heads/master c: 257a4b4 h: refs/heads/master i: 275231: d0a846c v: v3
git-mirror · Nov 8, 2011 · 05dca91 · 05dca91
1 parent 5daeaa4
commit 05dca91
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: 9a3f530f39f4490eaa18b02719fb74ce5f4d2d86
+refs/heads/master: 257a4b42af7586fab4eaec7f04e6896b86551843
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -3110,7 +3110,7 @@ static void handle_stripe(struct stripe_head *sh)
 	struct r5dev *pdev, *qdev;
 
 	clear_bit(STRIPE_HANDLE, &sh->state);
-	if (test_and_set_bit(STRIPE_ACTIVE, &sh->state)) {
+	if (test_and_set_bit_lock(STRIPE_ACTIVE, &sh->state)) {
 		/* already being handled, ensure it gets handled
 		 * again when current action finishes */
 		set_bit(STRIPE_HANDLE, &sh->state);
@@ -3375,7 +3375,7 @@ static void handle_stripe(struct stripe_head *sh)
 
 	return_io(s.return_bi);
 
-	clear_bit(STRIPE_ACTIVE, &sh->state);
+	clear_bit_unlock(STRIPE_ACTIVE, &sh->state);
 }
 
 static void raid5_activate_delayed(struct r5conf *conf)