Some support for external metadata.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 1ad6fd0dc3b5d266b17b0cd92c093a2de17439eb..733a466d8d9409f8cc573915ec82ff9123d6e206 100644 (file)
--- a/util.c
+++ b/util.c
@@ -692,6 +692,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 +761,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;
@@ -761,6 +800,8 @@ struct supertype *super_by_fd(int fd)
                st->sb = NULL;
        return st;
 }
+#endif /* !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO) */
+
 
 struct supertype *dup_super(struct supertype *st)
 {
@@ -772,7 +813,9 @@ struct supertype *dup_super(struct supertype *st)
        if (!st)
                return st;
 
-       if (st->minor_version == -1)
+       if (st->ss->text_version)
+               strcpy(version, st->ss->text_version);
+       else if (st->minor_version == -1)
                sprintf(version, "%d", st->ss->major);
        else
                sprintf(version, "%d.%d", st->ss->major, st->minor_version);
@@ -781,7 +824,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;
 }
 
@@ -864,45 +908,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;