summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2021-05-26 08:47:51 -0600
committerJens Axboe <axboe@kernel.dk>2021-05-26 08:47:51 -0600
commit094c271addc3e149e09474934c49a6b98f2d087f (patch)
treec7accd09e1483aabf726ad8bb499cb47c3dfc8e1
parentc0c8a8397fa8a74d04915f4d3d28cb4a5d401427 (diff)
parentcc146267914950b12c2bdee68c1e9e5453c81cde (diff)
Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.13
Pull MD fix from Song. * 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md: md/raid5: remove an incorrect assert in in_chunk_boundary
-rw-r--r--drivers/md/raid5.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 841e1c1aa5e6..7d4ff8a5c55e 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5311,8 +5311,6 @@ static int in_chunk_boundary(struct mddev *mddev, struct bio *bio)
unsigned int chunk_sectors;
unsigned int bio_sectors = bio_sectors(bio);
- WARN_ON_ONCE(bio->bi_bdev->bd_partno);
-
chunk_sectors = min(conf->chunk_sectors, conf->prev_chunk_sectors);
return chunk_sectors >=
((sector & (chunk_sectors - 1)) + bio_sectors);