github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 04:23:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

md/raid1: use the atomic queue limit update APIs

Browse Source 
Build the queue limits outside the queue and apply them using
queue_limits_set.  To make the code more obvious also split the queue
limits handling into a separate helper function.

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-7-hch@lst.de
This commit is contained in:
Christoph Hellwig 2024-03-03 07:01:45 -07:00 committed by Song Liu
parent 56cf22d6f6
commit 97894f7d3c
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/md/raid1.c
View File

@ -1926,12 +1926,11 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
for (mirror = first; mirror <= last; mirror++) { for (mirror = first; mirror <= last; mirror++) {
p = conf->mirrors + mirror; p = conf->mirrors + mirror;
if (!p->rdev) { if (!p->rdev) {
if (!mddev_is_dm(mddev)) err = mddev_stack_new_rdev(mddev, rdev);
disk_stack_limits(mddev->gendisk, rdev->bdev, if (err)
rdev->data_offset << 9); return err;
raid1_add_conf(conf, rdev, mirror, false); raid1_add_conf(conf, rdev, mirror, false);
err = 0;
/* As all devices are equivalent, we don't need a full recovery /* As all devices are equivalent, we don't need a full recovery
* if this was recently any drive of the array * if this was recently any drive of the array
*/ */
@ -3195,12 +3194,21 @@ static struct r1conf *setup_conf(struct mddev *mddev)
return ERR_PTR(err); return ERR_PTR(err);
} }
static int raid1_set_limits(struct mddev *mddev)
{
struct queue_limits lim;
blk_set_stacking_limits(&lim);
lim.max_write_zeroes_sectors = 0;
mddev_stack_rdev_limits(mddev, &lim);
return queue_limits_set(mddev->queue, &lim);
}
static void raid1_free(struct mddev *mddev, void *priv); static void raid1_free(struct mddev *mddev, void *priv);
static int raid1_run(struct mddev *mddev) static int raid1_run(struct mddev *mddev)
{ {
struct r1conf *conf; struct r1conf *conf;
int i; int i;
struct md_rdev *rdev;
int ret; int ret;
if (mddev->level != 1) { if (mddev->level != 1) {
@ -3228,10 +3236,9 @@ static int raid1_run(struct mddev *mddev)
return PTR_ERR(conf); return PTR_ERR(conf);
if (!mddev_is_dm(mddev)) { if (!mddev_is_dm(mddev)) {
blk_queue_max_write_zeroes_sectors(mddev->queue, 0); ret = raid1_set_limits(mddev);
rdev_for_each(rdev, mddev) if (ret)
disk_stack_limits(mddev->gendisk, rdev->bdev, goto abort;
rdev->data_offset << 9);
} }
mddev->degraded = 0; mddev->degraded = 0;