handle Manage_subdevs() for 'external' arrays

[thirdparty/mdadm.git] / util.c

diff --git a/util.c b/util.c
index a33486fde62c4bf1d67e510d7e2abc33cb1ba58f..c6273826d82c3da0082b421f16c640afc5d074cd 100644 (file)
--- a/util.c
+++ b/util.c
@@ -390,6 +390,9 @@ int is_standard(char *dev, int *nump)
        /* tests if dev is a "standard" md dev name.
         * i.e if the last component is "/dNN" or "/mdNN",
         * where NN is a string of digits
+        * Returns 1 if a partitionable standard,
+        *   -1 if non-partitonable,
+        *   0 if not a standard name.
         */
        char *d = strrchr(dev, '/');
        int type=0;
@@ -609,6 +612,23 @@ char *human_size_brief(long long bytes)
 }
 #endif
 
+unsigned long long calc_array_size(int level, int raid_disks, int layout,
+                                  int chunksize, unsigned long long devsize)
+{
+       int data_disks = 0;
+       switch (level) {
+       case 0: data_disks = raid_disks; break;
+       case 1: data_disks = 1; break;
+       case 4:
+       case 5: data_disks = raid_disks - 1; break;
+       case 6: data_disks = raid_disks - 2; break;
+       case 10: data_disks = raid_disks / (layout & 255) / ((layout>>8)&255);
+               break;
+       }
+       devsize &= ~(unsigned long long)((chunksize>>9)-1);
+       return data_disks * devsize;
+}
+
 #if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
 int get_mdp_major(void)
 {
@@ -760,9 +780,12 @@ int dev_open(char *dev, int flags)
        return fd;
 }
 
-struct superswitch *superlist[] = { &super0, &super1, &super_ddf, NULL };
+struct superswitch *superlist[] = { &super0, &super1, &super_ddf, &super_imsm, NULL };
 
 #if !defined(MDASSEMBLE) || defined(MDASSEMBLE) && defined(MDASSEMBLE_AUTO)
+
+struct supertype supertype_container_member;
+
 struct supertype *super_by_fd(int fd)
 {
        mdu_array_info_t array;
@@ -792,8 +815,11 @@ struct supertype *super_by_fd(int fd)
                sprintf(version, "%d.%d", vers, minor);
                verstr = version;
        }
-       for (i = 0; st == NULL && superlist[i] ; i++)
-               st = superlist[i]->match_metadata_desc(verstr);
+       if (minor == -2 && verstr[0] == '/')
+               st = &supertype_container_member;
+       else
+               for (i = 0; st == NULL && superlist[i] ; i++)
+                       st = superlist[i]->match_metadata_desc(verstr);
 
        if (sra)
                sysfs_free(sra);
@@ -958,6 +984,29 @@ int open_container(int fd)
        return -1;
 }
 
+char *devnum2devname(int num)
+{
+       char name[100];
+       if (num > 0)
+               sprintf(name, "md%d", num);
+       else
+               sprintf(name, "md_d%d", -1-num);
+       return strdup(name);
+}
+
+int fd2devnum(int fd)
+{
+       struct stat stb;
+       if (fstat(fd, &stb) == 0 &&
+           (S_IFMT&stb.st_mode)==S_IFBLK) {
+               if (major(stb.st_rdev) == MD_MAJOR)
+                       return minor(stb.st_rdev);
+               else
+                       return -1- (minor(stb.st_rdev)>>6);
+       }
+       return -1;
+}
+
 #ifdef __TINYC__
 /* tinyc doesn't optimize this check in ioctl.h out ... */
 unsigned int __invalid_size_argument_for_IOC = 0;