Skip to content

Commit

Permalink
md/raid5: more incorrect BUG_ON in handle_stripe_fill.
Browse files Browse the repository at this point in the history
It is not incorrect to call handle_stripe_fill() when
a batch of full-stripe writes is active.
It is, however, a BUG if fetch_block() then decides
it needs to actually fetch anything.

So move the 'BUG_ON' to where it belongs.

Signed-off-by: NeilBrown  <neilb@suse.de>
Fixes: 59fc630 ("RAID5: batch adjacent full stripe write")
  • Loading branch information
NeilBrown committed May 8, 2015
1 parent f18c1a3 commit b0c783b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -3302,6 +3302,7 @@ static int fetch_block(struct stripe_head *sh, struct stripe_head_state *s,
*/
BUG_ON(test_bit(R5_Wantcompute, &dev->flags));
BUG_ON(test_bit(R5_Wantread, &dev->flags));
BUG_ON(sh->batch_head);
if ((s->uptodate == disks - 1) &&
(s->failed && (disk_idx == s->failed_num[0] ||
disk_idx == s->failed_num[1]))) {
Expand Down Expand Up @@ -3370,7 +3371,6 @@ static void handle_stripe_fill(struct stripe_head *sh,
{
int i;

BUG_ON(sh->batch_head);
/* look for blocks to read/compute, skip this if a compute
* is already in flight, or if the stripe contents are in the
* midst of changing due to a write
Expand Down

0 comments on commit b0c783b

Please sign in to comment.