X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=blobdiff_plain;f=util.c;h=2d51de02ba4386ea3fae93a4cd41d7b7e998773b;hp=108f3c168d2414aa1e0473d7d0042a1933935584;hb=e4965ef8461b3d0db6e94939f07d814d819f86c2;hpb=95b79df03ebbb2c80b6a3bbe317b983d7cebe9cc

diff --git a/util.c b/util.c
index 108f3c16..2d51de02 100644
--- a/util.c
+++ b/util.c
@@ -606,6 +606,23 @@ char *human_size_brief(long long bytes)
 			);
 	return buf;
 }
+
+void print_r10_layout(int layout)
+{
+	int near = layout & 255;
+	int far = (layout >> 8) & 255;
+	int offset = (layout&0x10000);
+	char *sep = "";
+
+	if (near != 1) {
+		printf("%s near=%d", sep, near);
+		sep = ",";
+	}
+	if (far != 1)
+		printf("%s %s=%d", sep, offset?"offset":"far", far);
+	if (near*far == 1)
+		printf("NO REDUNDANCY");
+}
 #endif
 
 #if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
@@ -692,6 +709,44 @@ void put_md_name(char *name)
 	if (strncmp(name, "/dev/.tmp.md", 12)==0)
 		unlink(name);
 }
+
+static int dev2major(int d)
+{
+	if (d >= 0)
+		return MD_MAJOR;
+	else
+		return get_mdp_major();
+}
+
+static int dev2minor(int d)
+{
+	if (d >= 0)
+		return d;
+	return (-1-d) << MdpMinorShift;
+}
+
+int find_free_devnum(int use_partitions)
+{
+	int devnum;
+	for (devnum = 127; devnum != 128;
+	     devnum = devnum ? devnum-1 : (1<<22)-1) {
+		char *dn;
+		int _devnum;
+
+		_devnum = use_partitions ? (-1-devnum) : devnum;
+		if (mddev_busy(_devnum))
+			continue;
+		/* make sure it is new to /dev too, at least as a
+		 * non-standard */
+		dn = map_dev(dev2major(_devnum), dev2minor(_devnum), 0);
+		if (dn && ! is_standard(dn, NULL))
+			continue;
+		break;
+	}
+	if (devnum == 128)
+		return NoMdDev;
+	return use_partitions ? (-1-devnum) : devnum;
+}
 #endif /* !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) */
 
 int dev_open(char *dev, int flags)
@@ -723,6 +778,7 @@ int dev_open(char *dev, int flags)
 
 struct superswitch *superlist[] = { &super0, &super1, NULL };
 
+#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 struct supertype *super_by_fd(int fd)
 {
 	mdu_array_info_t array;
@@ -757,9 +813,12 @@ struct supertype *super_by_fd(int fd)
 
 	if (sra)
 		sysfs_free(sra);
-	st->sb = NULL;
+	if (st)
+		st->sb = NULL;
 	return st;
 }
+#endif /* !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) */
+
 
 struct supertype *dup_super(struct supertype *st)
 {
@@ -780,7 +839,8 @@ struct supertype *dup_super(struct supertype *st)
 	for (i = 0; stnew == NULL && superlist[i] ; i++)
 		stnew = superlist[i]->match_metadata_desc(verstr);
 
-	stnew->sb = NULL;
+	if (stnew)
+		stnew->sb = NULL;
 	return stnew;
 }
 
@@ -863,45 +923,6 @@ void get_one_disk(int mdfd, mdu_array_info_t *ainf, mdu_disk_info_t *disk)
 			return;
 }
 
-static int dev2major(int d)
-{
-	if (d >= 0)
-		return MD_MAJOR;
-	else
-		return get_mdp_major();
-}
-
-static int dev2minor(int d)
-{
-	if (d >= 0)
-		return d;
-	return (-1-d) << MdpMinorShift;
-}
-
-int find_free_devnum(int use_partitions)
-{
-	int devnum;
-	for (devnum = 127; devnum != 128;
-	     devnum = devnum ? devnum-1 : (1<<22)-1) {
-		char *dn;
-		int _devnum;
-
-		_devnum = use_partitions ? (-1-devnum) : devnum;
-		if (mddev_busy(_devnum))
-			continue;
-		/* make sure it is new to /dev too, at least as a
-		 * non-standard */
-		dn = map_dev(dev2major(_devnum), dev2minor(_devnum), 0);
-		if (dn && ! is_standard(dn, NULL))
-			continue;
-		break;
-	}
-	if (devnum == 128)
-		return NoMdDev;
-	return use_partitions ? (-1-devnum) : devnum;
-}
-
-
 #ifdef __TINYC__
 /* tinyc doesn't optimize this check in ioctl.h out ... */
 unsigned int __invalid_size_argument_for_IOC = 0;