diff --git a/[refs] b/[refs] index a0c0bd6de3b3..1baaa3d7b62f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 084dac53adcfb910792a66bc0bae720cdde971de +refs/heads/master: 2d6e4ecc87d20299bcb249dd62efbd73496744c3 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 9b00a229015a..0a5f03d93aef 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -3214,8 +3214,10 @@ static bool handle_stripe6(struct stripe_head *sh) /* now count some things */ if (test_bit(R5_LOCKED, &dev->flags)) s.locked++; if (test_bit(R5_UPTODATE, &dev->flags)) s.uptodate++; - if (test_bit(R5_Wantcompute, &dev->flags)) - BUG_ON(++s.compute > 2); + if (test_bit(R5_Wantcompute, &dev->flags)) { + s.compute++; + BUG_ON(s.compute > 2); + } if (test_bit(R5_Wantfill, &dev->flags)) { s.to_fill++;