diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 18:19:32 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-05-08 18:46:52 +1000 |
| commit | b0c783b32318bef29d64086fa812e8c659cb5b37 (patch) | |
| tree | bda4be5d9eb7fdca4d0d42a227de170a986ec424 /drivers | |
| parent | f18c1a35f62caccb527e8b0990c8801596e7c662 (diff) | |
| download | lwn-b0c783b32318bef29d64086fa812e8c659cb5b37.tar.gz lwn-b0c783b32318bef29d64086fa812e8c659cb5b37.zip | |
md/raid5: more incorrect BUG_ON in handle_stripe_fill.
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: 59fc630b8b5f ("RAID5: batch adjacent full stripe write")
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/raid5.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 91a1e8b26b52..415cac6d89bd 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -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]))) { @@ -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 |