diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-06-28 16:08:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-06-28 16:08:19 -0600 |
| commit | 3a08284ff22080e742814dad1dbabb4b66349642 (patch) | |
| tree | 3de2163fedca694e9b71f5d54eff8847a7875e7e /drivers/md/raid1-10.c | |
| parent | 89181f544ffa4da682b0145738342f9b78b9e8dc (diff) | |
| parent | 6d85ebf95c44e52337ca1d07f0db4b435d1e6762 (diff) | |
| download | linux-3a08284ff22080e742814dad1dbabb4b66349642.tar.gz linux-3a08284ff22080e742814dad1dbabb4b66349642.tar.bz2 linux-3a08284ff22080e742814dad1dbabb4b66349642.zip | |
Merge branch 'for-6.5/block-late' into block-6.5
* for-6.5/block-late:
blk-sysfs: add a new attr_group for blk_mq
blk-iocost: move wbt_enable/disable_default() out of spinlock
blk-wbt: cleanup rwb_enabled() and wbt_disabled()
blk-wbt: remove dead code to handle wbt enable/disable with io inflight
blk-wbt: don't create wbt sysfs entry if CONFIG_BLK_WBT is disabled
blk-mq: fix two misuses on RQF_USE_SCHED
blk-throttle: Fix io statistics for cgroup v1
bcache: Fix bcache device claiming
bcache: Alloc holder object before async registration
raid10: avoid spin_lock from fastpath from raid10_unplug()
md: fix 'delete_mutex' deadlock
md: use mddev->external to select holder in export_rdev()
md/raid1-10: fix casting from randomized structure in raid1_submit_write()
md/raid10: fix the condition to call bio_end_io_acct()
Diffstat (limited to 'drivers/md/raid1-10.c')
| -rw-r--r-- | drivers/md/raid1-10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid1-10.c b/drivers/md/raid1-10.c index 169ebe296f2d..3f22edec70e7 100644 --- a/drivers/md/raid1-10.c +++ b/drivers/md/raid1-10.c @@ -116,7 +116,7 @@ static void md_bio_reset_resync_pages(struct bio *bio, struct resync_pages *rp, static inline void raid1_submit_write(struct bio *bio) { - struct md_rdev *rdev = (struct md_rdev *)bio->bi_bdev; + struct md_rdev *rdev = (void *)bio->bi_bdev; bio->bi_next = NULL; bio_set_dev(bio, rdev->bdev); |