Blame SOURCES/0010-Create-Build-use-default_layout.patch

b33395
From 913f07d1db4a0078acc26d6ccabe1c315cf9273c Mon Sep 17 00:00:00 2001
b33395
From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
b33395
Date: Thu, 20 Jan 2022 13:18:32 +0100
b33395
Subject: [PATCH 10/12] Create, Build: use default_layout()
b33395
b33395
This code is duplicated for Build mode so make default_layout() extern
b33395
and use it. Simplify the function structure.
b33395
b33395
It introduced change for Build mode, now for raid0 RAID0_ORIG_LAYOUT
b33395
will be returned same as for Create.
b33395
b33395
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
b33395
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
b33395
---
b33395
 Build.c  | 23 +------------------
b33395
 Create.c | 67 ++++++++++++++++++++++++++++++++++----------------------
b33395
 mdadm.h  |  1 +
b33395
 3 files changed, 43 insertions(+), 48 deletions(-)
b33395
b33395
diff --git a/Build.c b/Build.c
b33395
index 962c2e37..8d6f6f58 100644
b33395
--- a/Build.c
b33395
+++ b/Build.c
b33395
@@ -71,28 +71,7 @@ int Build(char *mddev, struct mddev_dev *devlist,
b33395
 	}
b33395
 
b33395
 	if (s->layout == UnSet)
b33395
-		switch(s->level) {
b33395
-		default: /* no layout */
b33395
-			s->layout = 0;
b33395
-			break;
b33395
-		case 10:
b33395
-			s->layout = 0x102; /* near=2, far=1 */
b33395
-			if (c->verbose > 0)
b33395
-				pr_err("layout defaults to n1\n");
b33395
-			break;
b33395
-		case 5:
b33395
-		case 6:
b33395
-			s->layout = map_name(r5layout, "default");
b33395
-			if (c->verbose > 0)
b33395
-				pr_err("layout defaults to %s\n", map_num(r5layout, s->layout));
b33395
-			break;
b33395
-		case LEVEL_FAULTY:
b33395
-			s->layout = map_name(faultylayout, "default");
b33395
-
b33395
-			if (c->verbose > 0)
b33395
-				pr_err("layout defaults to %s\n", map_num(faultylayout, s->layout));
b33395
-			break;
b33395
-		}
b33395
+		s->layout = default_layout(NULL, s->level, c->verbose);
b33395
 
b33395
 	/* We need to create the device.  It can have no name. */
b33395
 	map_lock(&map);
b33395
diff --git a/Create.c b/Create.c
b33395
index 0ff1922d..9ea19de0 100644
b33395
--- a/Create.c
b33395
+++ b/Create.c
b33395
@@ -39,39 +39,54 @@ static int round_size_and_verify(unsigned long long *size, int chunk)
b33395
 	return 0;
b33395
 }
b33395
 
b33395
-static int default_layout(struct supertype *st, int level, int verbose)
b33395
+/**
b33395
+ * default_layout() - Get default layout for level.
b33395
+ * @st: metadata requested, could be NULL.
b33395
+ * @level: raid level requested.
b33395
+ * @verbose: verbose level.
b33395
+ *
b33395
+ * Try to ask metadata handler first, otherwise use global defaults.
b33395
+ *
b33395
+ * Return: Layout or &UnSet, return value meaning depends of level used.
b33395
+ */
b33395
+int default_layout(struct supertype *st, int level, int verbose)
b33395
 {
b33395
 	int layout = UnSet;
b33395
+	mapping_t *layout_map = NULL;
b33395
+	char *layout_name = NULL;
b33395
 
b33395
 	if (st && st->ss->default_geometry)
b33395
 		st->ss->default_geometry(st, &level, &layout, NULL);
b33395
 
b33395
-	if (layout == UnSet)
b33395
-		switch(level) {
b33395
-		default: /* no layout */
b33395
-			layout = 0;
b33395
-			break;
b33395
-		case 0:
b33395
-			layout = RAID0_ORIG_LAYOUT;
b33395
-			break;
b33395
-		case 10:
b33395
-			layout = 0x102; /* near=2, far=1 */
b33395
-			if (verbose > 0)
b33395
-				pr_err("layout defaults to n2\n");
b33395
-			break;
b33395
-		case 5:
b33395
-		case 6:
b33395
-			layout = map_name(r5layout, "default");
b33395
-			if (verbose > 0)
b33395
-				pr_err("layout defaults to %s\n", map_num(r5layout, layout));
b33395
-			break;
b33395
-		case LEVEL_FAULTY:
b33395
-			layout = map_name(faultylayout, "default");
b33395
+	if (layout != UnSet)
b33395
+		return layout;
b33395
 
b33395
-			if (verbose > 0)
b33395
-				pr_err("layout defaults to %s\n", map_num(faultylayout, layout));
b33395
-			break;
b33395
-		}
b33395
+	switch (level) {
b33395
+	default: /* no layout */
b33395
+		layout = 0;
b33395
+		break;
b33395
+	case 0:
b33395
+		layout = RAID0_ORIG_LAYOUT;
b33395
+		break;
b33395
+	case 10:
b33395
+		layout = 0x102; /* near=2, far=1 */
b33395
+		layout_name = "n2";
b33395
+		break;
b33395
+	case 5:
b33395
+	case 6:
b33395
+		layout_map = r5layout;
b33395
+		break;
b33395
+	case LEVEL_FAULTY:
b33395
+		layout_map = faultylayout;
b33395
+		break;
b33395
+	}
b33395
+
b33395
+	if (layout_map) {
b33395
+		layout = map_name(layout_map, "default");
b33395
+		layout_name = map_num(layout_map, layout);
b33395
+	}
b33395
+	if (layout_name && verbose > 0)
b33395
+		pr_err("layout defaults to %s\n", layout_name);
b33395
 
b33395
 	return layout;
b33395
 }
b33395
diff --git a/mdadm.h b/mdadm.h
b33395
index 26e7e5cd..cd72e711 100644
b33395
--- a/mdadm.h
b33395
+++ b/mdadm.h
b33395
@@ -1512,6 +1512,7 @@ extern int get_linux_version(void);
b33395
 extern int mdadm_version(char *version);
b33395
 extern unsigned long long parse_size(char *size);
b33395
 extern int parse_uuid(char *str, int uuid[4]);
b33395
+int default_layout(struct supertype *st, int level, int verbose);
b33395
 extern int is_near_layout_10(int layout);
b33395
 extern int parse_layout_10(char *layout);
b33395
 extern int parse_layout_faulty(char *layout);
b33395
-- 
b33395
2.31.1
b33395