From 913f07d1db4a0078acc26d6ccabe1c315cf9273c Mon Sep 17 00:00:00 2001 From: Mariusz Tkaczyk Date: Thu, 20 Jan 2022 13:18:32 +0100 Subject: Create, Build: use default_layout() This code is duplicated for Build mode so make default_layout() extern and use it. Simplify the function structure. It introduced change for Build mode, now for raid0 RAID0_ORIG_LAYOUT will be returned same as for Create. Signed-off-by: Mariusz Tkaczyk Signed-off-by: Jes Sorensen --- Build.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'Build.c') diff --git a/Build.c b/Build.c index 962c2e3..8d6f6f5 100644 --- a/Build.c +++ b/Build.c @@ -71,28 +71,7 @@ int Build(char *mddev, struct mddev_dev *devlist, } if (s->layout == UnSet) - switch(s->level) { - default: /* no layout */ - s->layout = 0; - break; - case 10: - s->layout = 0x102; /* near=2, far=1 */ - if (c->verbose > 0) - pr_err("layout defaults to n1\n"); - break; - case 5: - case 6: - s->layout = map_name(r5layout, "default"); - if (c->verbose > 0) - pr_err("layout defaults to %s\n", map_num(r5layout, s->layout)); - break; - case LEVEL_FAULTY: - s->layout = map_name(faultylayout, "default"); - - if (c->verbose > 0) - pr_err("layout defaults to %s\n", map_num(faultylayout, s->layout)); - break; - } + s->layout = default_layout(NULL, s->level, c->verbose); /* We need to create the device. It can have no name. */ map_lock(&map); -- cgit v1.2.1