From 05dca91d52873f4775f999b88ee99b628b699dce Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 8 Nov 2011 16:22:06 +1100 Subject: [PATCH] --- yaml --- r: 275233 b: refs/heads/master c: 257a4b42af7586fab4eaec7f04e6896b86551843 h: refs/heads/master i: 275231: d0a846c81ef8088e1d6653235c7745ba6681432f v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2d13655c3b33..42838e415da5 100644 --- 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 index 318bdae9b56c..297e26092178 100644 --- 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)