Initial DDF support code.

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index 6efb88aaef06d8424dc67084467e5ec5f9815642..a33486fde62c4bf1d67e510d7e2abc33cb1ba58f 100644 (file)
--- a/util.c
+++ b/util.c
@@ -31,6 +31,7 @@
 #include       "md_p.h"
 #include       <sys/utsname.h>
 #include       <ctype.h>
+#include       <dirent.h>
 
 /*
  * following taken from linux/blkpg.h because they aren't
@@ -692,6 +693,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)
@@ -721,8 +760,9 @@ int dev_open(char *dev, int flags)
        return fd;
 }
 
-struct superswitch *superlist[] = { &super0, &super1, NULL };
+struct superswitch *superlist[] = { &super0, &super1, &super_ddf, NULL };
 
+#if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 struct supertype *super_by_fd(int fd)
 {
        mdu_array_info_t array;
@@ -761,6 +801,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 +814,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);
@@ -865,45 +909,55 @@ void get_one_disk(int mdfd, mdu_array_info_t *ainf, mdu_disk_info_t *disk)
                        return;
 }
 
-static int dev2major(int d)
+int open_container(int fd)
 {
-       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;
-}
+       /* 'fd' is a block device.  Find out if it is in use
+        * by a container, and return an open fd on that container.
+        */
+       char path[256];
+       char *e;
+       DIR *dir;
+       struct dirent *de;
+       int dfd, n;
+       char buf[200];
+       int major, minor;
+       struct stat st;
 
-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;
+       if (fstat(fd, &st) != 0)
+               return -1;
+       sprintf(path, "/sys/dev/block/%d:%d/holders",
+               (int)major(st.st_rdev), (int)minor(st.st_rdev));
+       e = path + strlen(path);
 
-               _devnum = use_partitions ? (-1-devnum) : devnum;
-               if (mddev_busy(_devnum))
+       dir = opendir(path);
+       if (!dir)
+               return -1;
+       while ((de = readdir(dir))) {
+               if (de->d_ino == 0)
                        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))
+               if (de->d_name[0] == '.')
                        continue;
-               break;
+               sprintf(e, "/%s/dev", de->d_name);
+               dfd = open(path, O_RDONLY);
+               if (dfd < 0)
+                       continue;
+               n = read(dfd, buf, sizeof(buf));
+               close(dfd);
+               if (n <= 0 || n >= sizeof(buf))
+                       continue;
+               buf[n] = 0;
+               if (sscanf(buf, "%d:%d", &major, &minor) != 2)
+                       continue;
+               sprintf(buf, "%d:%d", major, minor);
+               dfd = dev_open(buf, O_RDONLY);
+               if (dfd >= 0) {
+                       closedir(dir);
+                       return dfd;
+               }
        }
-       if (devnum == 128)
-               return NoMdDev;
-       return use_partitions ? (-1-devnum) : devnum;
+       return -1;
 }
 
-
 #ifdef __TINYC__
 /* tinyc doesn't optimize this check in ioctl.h out ... */
 unsigned int __invalid_size_argument_for_IOC = 0;