---

yaml --- r: 292789 b: refs/heads/master c: 41fe75f h: refs/heads/master i: 292787: c237f29 v: v3
git-mirror · Mar 13, 2012 · 6937762 · 6937762
1 parent cdf088f
commit 6937762
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43437ecd5adc8bd712b7140c8a70e2b4a80a89dd
+refs/heads/master: 41fe75f60bcd4d698daed3e54bb099227358ce58
diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c
@@ -208,11 +208,10 @@ static void __release_stripe(struct r5conf *conf, struct stripe_head *sh)
 			md_wakeup_thread(conf->mddev->thread);
 		} else {
 			BUG_ON(stripe_operations_active(sh));
-			if (test_and_clear_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) {
-				atomic_dec(&conf->preread_active_stripes);
-				if (atomic_read(&conf->preread_active_stripes) < IO_THRESHOLD)
+			if (test_and_clear_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
+				if (atomic_dec_return(&conf->preread_active_stripes)
+				    < IO_THRESHOLD)
 					md_wakeup_thread(conf->mddev->thread);
-			}
 			atomic_dec(&conf->active_stripes);
 			if (!test_bit(STRIPE_EXPANDING, &sh->state)) {
 				list_add_tail(&sh->lru, &conf->inactive_list);