[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251015080354.3398457-4-linan122@huawei.com>
Date: Wed, 15 Oct 2025 16:03:53 +0800
From: <linan122@...wei.com>
To: <corbet@....net>, <song@...nel.org>, <yukuai3@...wei.com>,
<linan122@...wei.com>, <xni@...hat.com>, <hare@...e.de>
CC: <linux-doc@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<linux-raid@...r.kernel.org>, <martin.petersen@...cle.com>,
<linan666@...weicloud.com>, <yangerkun@...wei.com>, <yi.zhang@...wei.com>
Subject: [PATCH -next v7 3/4] md/raid0: Move queue limit setup before r0conf initialization
From: Li Nan <linan122@...wei.com>
Prepare for making logical blocksize configurable.
Move raid0_set_limits() before create_strip_zones(). It is safe as fields
modified in create_strip_zones() do not involve mddev configuration, and
rdev modifications there are not used in raid0_set_limits().
'blksize' in create_strip_zones() fetches mddev's logical block size. This
change has no impact until logical block size becomes configurable.
Signed-off-by: Li Nan <linan122@...wei.com>
---
drivers/md/raid0.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index adc9e68d064d..5bff8b4ded41 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -68,7 +68,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf)
struct strip_zone *zone;
int cnt;
struct r0conf *conf = kzalloc(sizeof(*conf), GFP_KERNEL);
- unsigned blksize = 512;
+ unsigned int blksize = queue_logical_block_size(mddev->gendisk->queue);
*private_conf = ERR_PTR(-ENOMEM);
if (!conf)
@@ -404,6 +404,12 @@ static int raid0_run(struct mddev *mddev)
if (md_check_no_bitmap(mddev))
return -EINVAL;
+ if (!mddev_is_dm(mddev)) {
+ ret = raid0_set_limits(mddev);
+ if (ret)
+ return ret;
+ }
+
/* if private is not null, we are here after takeover */
if (mddev->private == NULL) {
ret = create_strip_zones(mddev, &conf);
@@ -412,11 +418,6 @@ static int raid0_run(struct mddev *mddev)
mddev->private = conf;
}
conf = mddev->private;
- if (!mddev_is_dm(mddev)) {
- ret = raid0_set_limits(mddev);
- if (ret)
- return ret;
- }
/* calculate array device size */
md_set_array_sectors(mddev, raid0_size(mddev, 0, 0));
--
2.39.2
Powered by blists - more mailing lists