Commit 2d6e4ecc authored by Dan Williams's avatar Dan Williams
Browse files

md/raid6: eliminate BUG_ON with side effect 



As pointed out by Neil it should be possible to build a driver with all
BUG_ON statements deleted.  It's bad form to have a BUG_ON with a side
effect.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 084dac53

drivers/md/raid5.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -3214,8 +3214,10 @@ static bool handle_stripe6(struct stripe_head *sh) 
		/* now count some things */

		/* now count some things */

		if (test_bit(R5_LOCKED, &dev->flags)) s.locked++;

		if (test_bit(R5_LOCKED, &dev->flags)) s.locked++;

		if (test_bit(R5_UPTODATE, &dev->flags)) s.uptodate++;

		if (test_bit(R5_UPTODATE, &dev->flags)) s.uptodate++;

		if (test_bit(R5_Wantcompute, &dev->flags))

		if (test_bit(R5_Wantcompute, &dev->flags)) {

			BUG_ON(++s.compute > 2);

			s.compute++;

			BUG_ON(s.compute > 2);

		}





		if (test_bit(R5_Wantfill, &dev->flags)) {

		if (test_bit(R5_Wantfill, &dev->flags)) {

			s.to_fill++;

			s.to_fill++;