diff options
| author |   Jens Axboe <axboe@kernel.dk> | 2022-02-03 11:54:53 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2022-02-03 11:54:53 -0700 |
| commit | aace2b7a93ca48dc075af8526394bc5d43b5b148 (patch) | |
| tree | 80ff1facced975fe5a48cee8d752b6fcf4ef8d85 | |
| parent | block: fix DIO handling regressions in blkdev_read_iter() (diff) | |
| parent | md: fix NULL pointer deref with nowait but no mddev->queue (diff) | |
| download | wireguard-linux-aace2b7a93ca48dc075af8526394bc5d43b5b148.tar.xz wireguard-linux-aace2b7a93ca48dc075af8526394bc5d43b5b148.zip | |
Merge branch 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-5.17
Pull MD fix from Song:
"Please consider pulling the following fix on top of your block-5.17
branch. It fixes a NULL ptr deref case with nowait."
* 'md-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md: fix NULL pointer deref with nowait but no mddev->queue
Diffstat (limited to '')
| -rw-r--r-- | drivers/md/md.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 5881d05a76eb..4d38bd7dadd6 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -5869,10 +5869,6 @@ int md_run(struct mddev *mddev) nowait = nowait && blk_queue_nowait(bdev_get_queue(rdev->bdev)); } - /* Set the NOWAIT flags if all underlying devices support it */ - if (nowait) - blk_queue_flag_set(QUEUE_FLAG_NOWAIT, mddev->queue); - if (!bioset_initialized(&mddev->bio_set)) { err = bioset_init(&mddev->bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS); if (err) @@ -6010,6 +6006,10 @@ int md_run(struct mddev *mddev) else blk_queue_flag_clear(QUEUE_FLAG_NONROT, mddev->queue); blk_queue_flag_set(QUEUE_FLAG_IO_STAT, mddev->queue); + + /* Set the NOWAIT flags if all underlying devices support it */ + if (nowait) + blk_queue_flag_set(QUEUE_FLAG_NOWAIT, mddev->queue); } if (pers->sync_request) { if (mddev->kobj.sd && |