diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-27 08:29:36 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-10-27 08:29:36 -1000 |
| commit | 75f8b2f52632fbbbbabc5e9c3a6f820282ff8920 (patch) | |
| tree | f8a7ef8e77b0ee08d9c11c6de87c2b8ea4da57ac /drivers/md/raid10.c | |
| parent | a8b3be2617d677796e576cc64d4ad9de45dfaf14 (diff) | |
| parent | 2ff949441802a8d076d9013c7761f63e8ae5a9bd (diff) | |
| download | linux-next-75f8b2f52632fbbbbabc5e9c3a6f820282ff8920.tar.gz linux-next-75f8b2f52632fbbbbabc5e9c3a6f820282ff8920.zip | |
Merge tag 'block-6.12-20241026' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- Pull request for MD via Song fixing a few issues
- Fix a wrong check in blk_rq_map_user_bvec(), causing IO errors on
passthrough IO (Xinyu)
* tag 'block-6.12-20241026' of git://git.kernel.dk/linux:
block: fix sanity checks in blk_rq_map_user_bvec
md/raid10: fix null ptr dereference in raid10_size()
md: ensure child flush IO does not affect origin bio->bi_status
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index f3bf1116794a..862b1fb71d86 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -4061,9 +4061,12 @@ static int raid10_run(struct mddev *mddev) } if (!mddev_is_dm(conf->mddev)) { - ret = raid10_set_queue_limits(mddev); - if (ret) + int err = raid10_set_queue_limits(mddev); + + if (err) { + ret = err; goto out_free_conf; + } } /* need to check that every block has at least one working mirror */ |