]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - util.c
mdadm-1.5.0
[thirdparty/mdadm.git] / util.c
diff --git a/util.c b/util.c
index 9d94c6acc76e3b21ec21b16b00001e6591396570..bdafe66cc1afe11db6d598d62f51d6bb1350fe65 100644 (file)
--- a/util.c
+++ b/util.c
@@ -30,6 +30,7 @@
 #include       "mdadm.h"
 #include       "md_p.h"
 #include       <sys/utsname.h>
+#include       <ctype.h>
 
 /*
  * Parse a 128 bit uuid in 4 integers
@@ -91,7 +92,8 @@ int md_get_version(int fd)
 
     if (ioctl(fd, RAID_VERSION, &vers) == 0)
        return  (vers.major*10000) + (vers.minor*100) + vers.patchlevel;
-
+    if (errno == EACCES)
+           return -1;
     if (MAJOR(stb.st_rdev) == MD_MAJOR)
        return (3600);
     return -1;
@@ -101,12 +103,18 @@ int md_get_version(int fd)
 int get_linux_version()
 {
        struct utsname name;
+       char *cp;
        int a,b,c;
        if (uname(&name) <0)
                return -1;
 
-       if (sscanf(name.release, "%d.%d.%d", &a,&b,&c)!= 3)
-               return -1;
+       cp = name.release;
+       a = strtoul(cp, &cp, 10);
+       if (*cp != '.') return -1;
+       b = strtoul(cp+1, &cp, 10);
+       if (*cp != '.') return -1;
+       c = strtoul(cp+1, NULL, 10);
+
        return (a*1000000)+(b*1000)+c;
 }
 
@@ -123,6 +131,8 @@ int enough(int level, int raid_disks, int avail_disks)
        case 4:
        case 5:
                return avail_disks >= raid_disks-1;
+       case 6:
+               return avail_disks >= raid_disks-2;
        default:
                return 0;
        }
@@ -212,6 +222,8 @@ int load_super(int fd, mdp_super_t *super)
 
        offset *= 512;
 
+       ioctl(fd, BLKFLSBUF, 0); /* make sure we read current data */
+
        if (lseek64(fd, offset, 0)< 0LL)
                return 3;
 
@@ -314,10 +326,10 @@ int check_raid(int fd, char *name)
        if (load_super(fd, &super))
                return 0;
        /* Looks like a raid array .. */
-       fprintf(stderr, Name ": %s appear to be part of a raid array:\n",
+       fprintf(stderr, Name ": %s appears to be part of a raid array:\n",
                name);
        crtime = super.ctime;
-       fprintf(stderr, "    level=%d disks=%d ctime=%s",
+       fprintf(stderr, "    level=%d devices=%d ctime=%s",
                super.level, super.raid_disks, ctime(&crtime));
        return 1;
 }
@@ -360,7 +372,7 @@ int map_name(mapping_t *map, char *name)
                        return map->num;
                map++;
        }
-       return -10;
+       return UnSet;
 }
 
 /*
@@ -375,11 +387,25 @@ struct devmap {
 } *devlist = NULL;
 int devlist_ready = 0;
 
+#ifdef UCLIBC
+char *map_dev(int major, int minor)
+{
+#if 0
+       fprintf(stderr, "Warning - fail to map %d,%d to a device name\n",
+               major, minor);
+#endif
+       return NULL;
+}
+#else
 #define  __USE_XOPEN_EXTENDED
 #include <ftw.h>
 
 
+#ifndef __dietlibc__
 int add_dev(const char *name, const struct stat *stb, int flag, struct FTW *s)
+#else
+int add_dev(const char *name, const struct stat *stb, int flag)
+#endif
 {
     if ((stb->st_mode&S_IFMT)== S_IFBLK) {
        char *n = strdup(name);
@@ -399,7 +425,11 @@ char *map_dev(int major, int minor)
 {
     struct devmap *p;
     if (!devlist_ready) {
+#ifndef __dietlibc__
        nftw("/dev", add_dev, 10, FTW_PHYS);
+#else
+       ftw("/dev", add_dev, 10);
+#endif
        devlist_ready=1;
     }
 
@@ -410,8 +440,9 @@ char *map_dev(int major, int minor)
     return NULL;
 }
 
+#endif
 
-int calc_sb_csum(mdp_super_t *super)
+unsigned long calc_sb_csum(mdp_super_t *super)
 {
         unsigned int  oldcsum = super->sb_csum;
        unsigned long long newcsum = 0;
@@ -437,16 +468,16 @@ char *human_size(long long bytes)
        else if (bytes < 2*1024LL*1024LL*1024LL)
                sprintf(buf, " (%ld.%02ld MiB %ld.%02ld MB)",
                        (long)(bytes>>20),
-                       (long)(bytes&0xfffff)/(0x100000/100),
+                       (long)((bytes&0xfffff)+0x100000/200)/(0x100000/100),
                        (long)(bytes/1000/1000),
-                       (long)((bytes%1000000)/10000)
+                       (long)(((bytes%1000000)+5000)/10000)
                        );
        else
                sprintf(buf, " (%ld.%02ld GiB %ld.%02ld GB)",
                        (long)(bytes>>30),
-                       (long)((bytes>>10)&0xfffff)/(0x100000/100),
+                       (long)(((bytes>>10)&0xfffff)+0x100000/200)/(0x100000/100),
                        (long)(bytes/1000LL/1000LL/1000LL),
-                       (long)(((bytes/1000)%1000000)/10000)
+                       (long)((((bytes/1000)%1000000)+5000)/10000)
                        );
        return buf;
 }
@@ -458,42 +489,78 @@ char *human_size_brief(long long bytes)
 
        if (bytes < 5000*1024)
                sprintf(buf, "%ld.%02ldKiB",
-                       (long)(bytes>>10), (long)((bytes&1023)*100/1024)
+                       (long)(bytes>>10), (long)(((bytes&1023)*100+512)/1024)
                        );
        else if (bytes < 2*1024LL*1024LL*1024LL)
                sprintf(buf, "%ld.%02ldMiB",
                        (long)(bytes>>20),
-                       (long)(bytes&0xfffff)/(0x100000/100)
+                       (long)((bytes&0xfffff)+0x100000/200)/(0x100000/100)
                        );
        else
                sprintf(buf, "%ld.%02ldGiB",
                        (long)(bytes>>30),
-                       (long)((bytes>>10)&0xfffff)/(0x100000/100)
+                       (long)(((bytes>>10)&0xfffff)+0x100000/200)/(0x100000/100)
                        );
        return buf;
 }
 
+static int mdp_major = -1;
+void get_mdp_major(void)
+{
+       FILE *fl = fopen("/proc/devices", "r");
+       char *w;
+       int have_block = 0;
+       int have_devices = 0;
+       int last_num = -1;
+       if (!fl)
+               return;
+       while ((w = conf_word(fl, 1))) {
+               if (have_block && strcmp(w, "devices:")==0)
+                       have_devices = 1;
+               have_block =  (strcmp(w, "Block")==0);
+               if (isdigit(w[0]))
+                       last_num = atoi(w);
+               if (have_devices && strcmp(w, "mdp")==0)
+                       mdp_major = last_num;
+               free(w);
+       }
+       fclose(fl);
+}
+
+
 
-#define MD_MAJOR 9
 char *get_md_name(int dev)
 {
        /* find /dev/md%d or /dev/md/%d or make a device /dev/.tmp.md%d */
+       /* if dev < 0, want /dev/md/d%d or find mdp in /proc/devices ... */
        static char devname[50];
        struct stat stb;
-       dev_t rdev = MKDEV(MD_MAJOR, dev);
-
-       sprintf(devname, "/dev/md%d", dev);
-       if (stat(devname, &stb) == 0
-           && (S_IFMT&stb.st_mode) == S_IFBLK
-           && (stb.st_rdev == rdev))
-               return devname;
-
-       sprintf(devname, "/dev/md/%d", dev);
-       if (stat(devname, &stb) == 0
-           && (S_IFMT&stb.st_mode) == S_IFBLK
-           && (stb.st_rdev == rdev))
-               return devname;
-
+       dev_t rdev;
+
+       if (dev < 0) {
+
+               if (mdp_major < 0) get_mdp_major();
+               if (mdp_major < 0) return NULL;
+               rdev = MKDEV(mdp_major, (-1-dev)<<6);
+               sprintf(devname, "/dev/md/d%d", -1-dev);
+               if (stat(devname, &stb) == 0
+                   && (S_IFMT&stb.st_mode) == S_IFBLK
+                   && (stb.st_rdev == rdev))
+                       return devname;
+       } else {
+               rdev = MKDEV(MD_MAJOR, dev);
+               sprintf(devname, "/dev/md%d", dev);
+               if (stat(devname, &stb) == 0
+                   && (S_IFMT&stb.st_mode) == S_IFBLK
+                   && (stb.st_rdev == rdev))
+                       return devname;
+
+               sprintf(devname, "/dev/md/%d", dev);
+               if (stat(devname, &stb) == 0
+                   && (S_IFMT&stb.st_mode) == S_IFBLK
+                   && (stb.st_rdev == rdev))
+                       return devname;
+       }
        sprintf(devname, "/dev/.tmp.md%d", dev);
        if (mknod(devname, S_IFBLK | 0600, rdev) == -1)
                return NULL;