Detail: Respect code lines are 80 character wide

[thirdparty/mdadm.git] / mdopen.c

diff --git a/mdopen.c b/mdopen.c
index e71d7586cf79d36023eed8beaf45d62af8aaaf01..82b97fc903394d432f4de982ffbe2e7ed30c38a4 100644 (file)
--- a/mdopen.c
+++ b/mdopen.c
@@ -144,7 +144,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
        struct createinfo *ci = conf_get_create_info();
        int parts;
        char *cname;
-       char devname[20];
+       char devname[37];
        char devnm[32];
        char cbuf[400];
        if (chosen == NULL)
@@ -313,12 +313,24 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
                if (n < 0)
                        devnm[0] = 0;
        }
+       if (num >= 0) {
+               int fd;
+               int n = -1;
+               sprintf(devnm, "md%d", num);
+               fd = open("/sys/module/md_mod/parameters/new_array", O_WRONLY);
+               if (fd >= 0) {
+                       n = write(fd, devnm, strlen(devnm));
+                       close(fd);
+               }
+               if (n < 0)
+                       devnm[0] = 0;
+       }
        if (devnm[0])
                ;
        else if (num < 0) {
                /* need to choose a free number. */
                char *_devnm = find_free_devnm(use_mdp);
-               if (devnm == NULL) {
+               if (_devnm == NULL) {
                        pr_err("No avail md devices - aborting\n");
                        return -1;
                }
@@ -416,21 +428,23 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
  */
 int open_mddev(char *dev, int report_errors)
 {
-       int mdfd = open(dev, O_RDWR);
-       if (mdfd < 0 && errno == EACCES)
-               mdfd = open(dev, O_RDONLY);
+       struct mdu_array_info_s array;
+       int mdfd = open(dev, O_RDONLY);
+
        if (mdfd < 0) {
                if (report_errors)
                        pr_err("error opening %s: %s\n",
                                dev, strerror(errno));
                return -1;
        }
-       if (md_get_version(mdfd) <= 0) {
+
+       if (md_get_array_info(mdfd, &array) != 0) {
                close(mdfd);
                if (report_errors)
                        pr_err("%s does not appear to be an md device\n", dev);
                return -2;
        }
+
        return mdfd;
 }
 
@@ -439,7 +453,7 @@ char *find_free_devnm(int use_partitions)
        static char devnm[32];
        int devnum;
        for (devnum = 127; devnum != 128;
-            devnum = devnum ? devnum-1 : (1<<20)-1) {
+            devnum = devnum ? devnum-1 : (1<<9)-1) {
 
                if (use_partitions)
                        sprintf(devnm, "md_d%d", devnum);