diff options
| author | Christoph Hellwig <hch@lst.de> | 2024-03-03 07:01:49 -0700 |
|---|---|---|
| committer | Song Liu <song@kernel.org> | 2024-03-06 08:59:53 -0800 |
| commit | 396799eb5b6f87ec2d759e1a90e179f7058ab9e6 (patch) | |
| tree | 4387954e547239a750af9ddffb1bf36a8241f0d1 /drivers/md/raid5.c | |
| parent | 81a16e19d545fd244ad176f7222d92b67215a33b (diff) | |
| download | linux-396799eb5b6f87ec2d759e1a90e179f7058ab9e6.tar.gz | |
md: remove mddev->queue
Just use the request_queue from the gendisk pointer in the relatively
few places that sill need it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed--by: Song Liu <song@kernel.org>
Tested-by: Song Liu <song@kernel.org>
Signed-off-by: Song Liu <song@kernel.org>
Link: https://lore.kernel.org/r/20240303140150.5435-11-hch@lst.de
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 5012069782bab..f2e3c3e2d879f 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -4275,9 +4275,10 @@ static int handle_stripe_dirtying(struct r5conf *conf, } } if (rcw && !mddev_is_dm(conf->mddev)) - blk_add_trace_msg(conf->mddev->queue, "raid5 rcw %llu %d %d %d", - (unsigned long long)sh->sector, - rcw, qread, test_bit(STRIPE_DELAYED, &sh->state)); + blk_add_trace_msg(conf->mddev->gendisk->queue, + "raid5 rcw %llu %d %d %d", + (unsigned long long)sh->sector, rcw, qread, + test_bit(STRIPE_DELAYED, &sh->state)); } if (rcw > disks && rmw > disks && @@ -5686,7 +5687,7 @@ static void raid5_unplug(struct blk_plug_cb *blk_cb, bool from_schedule) release_inactive_stripe_list(conf, cb->temp_inactive_list, NR_STRIPE_HASH_LOCKS); if (!mddev_is_dm(mddev)) - trace_block_unplug(mddev->queue, cnt, !from_schedule); + trace_block_unplug(mddev->gendisk->queue, cnt, !from_schedule); kfree(cb); } @@ -7089,7 +7090,7 @@ raid5_store_skip_copy(struct mddev *mddev, const char *page, size_t len) if (!conf) err = -ENODEV; else if (new != conf->skip_copy) { - struct request_queue *q = mddev->queue; + struct request_queue *q = mddev->gendisk->queue; conf->skip_copy = new; if (new) @@ -7749,7 +7750,7 @@ static int raid5_set_limits(struct mddev *mddev) /* No restrictions on the number of segments in the request */ lim.max_segments = USHRT_MAX; - return queue_limits_set(mddev->queue, &lim); + return queue_limits_set(mddev->gendisk->queue, &lim); } static int raid5_run(struct mddev *mddev) |