In kernel space super_1_validate sets mddev->layout to -1 if MD_FEATURE_RAID0_LAYOUT
is not set. MD_FEATURE_RAID0_LAYOUT is set in mdadm write_init_super1. Now only raid
with more than one zone can set this bit. But for raid0 with same size member disks,
it doesn't set this bit. The layout is *unknown* when running mdadm -D command. In
fact it should be RAID0_ORIG_LAYOUT which gets from default_layout.
So set MD_FEATURE_RAID0_LAYOUT when sb->layout has value.
Fixes: 329dfc28debb ('Create: add support for RAID0 layouts.')
Signed-off-by: Xiao Ni <xni@xxxxxxxxxx>
---
super1.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/super1.c b/super1.c
index 856b02082662..f29751b4a5c7 100644
--- a/super1.c
+++ b/super1.c
@@ -1978,26 +1978,10 @@ static int write_init_super1(struct supertype *st)
unsigned long long sb_offset;
unsigned long long data_offset;
long bm_offset;
- int raid0_need_layout = 0;
- for (di = st->info; di; di = di->next) {
+ for (di = st->info; di; di = di->next)
if (di->disk.state & (1 << MD_DISK_JOURNAL))
sb->feature_map |= __cpu_to_le32(MD_FEATURE_JOURNAL);
- if (sb->level == 0 && sb->layout != 0) {
- struct devinfo *di2 = st->info;
- unsigned long long s1, s2;
- s1 = di->dev_size;
- if (di->data_offset != INVALID_SECTORS)
- s1 -= di->data_offset;
- s1 /= __le32_to_cpu(sb->chunksize);
- s2 = di2->dev_size;
- if (di2->data_offset != INVALID_SECTORS)
- s2 -= di2->data_offset;
- s2 /= __le32_to_cpu(sb->chunksize);
- if (s1 != s2)
- raid0_need_layout = 1;
- }
- }
for (di = st->info; di; di = di->next) {
if (di->disk.state & (1 << MD_DISK_FAULTY))
@@ -2139,8 +2123,7 @@ static int write_init_super1(struct supertype *st)
sb->bblog_offset = 0;
}
- /* RAID0 needs a layout if devices aren't all the same size */
- if (raid0_need_layout)
+ if (sb->level == 0 && sb->layout)
sb->feature_map |= __cpu_to_le32(MD_FEATURE_RAID0_LAYOUT);
sb->sb_csum = calc_sb_1_csum(sb);
--
2.32.0 (Apple Git-132)
