mdadm.h: Introduced unaligned {get,put}_unaligned{16,32}()

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index df1bc20c635b53e5c80ae774b9b03bab16b78e38..292f92a9ae639ecaa981e273e30a9f3686345460 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -27,6 +27,18 @@
 #include       "md_p.h"
 #include       <ctype.h>
 
+static int round_size_and_verify(unsigned long long *size, int chunk)
+{
+       if (*size == 0)
+               return 0;
+       *size &= ~(unsigned long long)(chunk - 1);
+       if (*size == 0) {
+               pr_err("Size cannot be smaller than chunk.\n");
+               return 1;
+       }
+       return 0;
+}
+
 static int default_layout(struct supertype *st, int level, int verbose)
 {
        int layout = UnSet;
@@ -89,8 +101,8 @@ int Create(struct supertype *st, char *mddev,
        char *maxdisc = NULL;
        int dnum, raid_disk_num;
        struct mddev_dev *dv;
+       dev_t rdev;
        int fail = 0, warn = 0;
-       struct stat stb;
        int first_missing = subdevs * 2;
        int second_missing = subdevs * 2;
        int missing_disks = 0;
@@ -248,11 +260,14 @@ int Create(struct supertype *st, char *mddev,
                pr_err("unknown level %d\n", s->level);
                return 1;
        }
+
        if (s->size == MAX_SIZE)
                /* use '0' to mean 'max' now... */
                s->size = 0;
        if (s->size && s->chunk && s->chunk != UnSet)
-               s->size &= ~(unsigned long long)(s->chunk - 1);
+               if (round_size_and_verify(&s->size, s->chunk))
+                       return 1;
+
        newsize = s->size * 2;
        if (st && ! st->ss->validate_geometry(st, s->level, s->layout, s->raiddisks,
                                              &s->chunk, s->size*2,
@@ -267,7 +282,8 @@ int Create(struct supertype *st, char *mddev,
                        /* default chunk was just set */
                        if (c->verbose > 0)
                                pr_err("chunk size defaults to %dK\n", s->chunk);
-                       s->size &= ~(unsigned long long)(s->chunk - 1);
+                       if (round_size_and_verify(&s->size, s->chunk))
+                               return 1;
                        do_default_chunk = 0;
                }
        }
@@ -325,11 +341,8 @@ int Create(struct supertype *st, char *mddev,
                                dname, strerror(errno));
                        exit(2);
                }
-               if (fstat(dfd, &stb) != 0 ||
-                   (stb.st_mode & S_IFMT) != S_IFBLK) {
+               if (!fstat_is_blkdev(dfd, dname, NULL)) {
                        close(dfd);
-                       pr_err("%s is not a block device\n",
-                               dname);
                        exit(2);
                }
                close(dfd);
@@ -416,7 +429,8 @@ int Create(struct supertype *st, char *mddev,
                                /* default chunk was just set */
                                if (c->verbose > 0)
                                        pr_err("chunk size defaults to %dK\n", s->chunk);
-                               s->size &= ~(unsigned long long)(s->chunk - 1);
+                               if (round_size_and_verify(&s->size, s->chunk))
+                                       return 1;
                                do_default_chunk = 0;
                        }
                }
@@ -478,6 +492,10 @@ int Create(struct supertype *st, char *mddev,
                        close(fd);
                }
        }
+       if (missing_disks == dnum && !have_container) {
+               pr_err("Subdevs can't be all missing\n");
+               return 1;
+       }
        if (s->raiddisks + s->sparedisks > st->max_devs) {
                pr_err("Too many devices: %s metadata only supports %d\n",
                        st->ss->name, st->max_devs);
@@ -641,8 +659,8 @@ int Create(struct supertype *st, char *mddev,
         * with, but it chooses to trust me instead. Sigh
         */
        info.array.md_minor = 0;
-       if (fstat(mdfd, &stb) == 0)
-               info.array.md_minor = minor(stb.st_rdev);
+       if (fstat_is_blkdev(mdfd, mddev, &rdev))
+               info.array.md_minor = minor(rdev);
        info.array.not_persistent = 0;
 
        if (((s->level == 4 || s->level == 5) &&
@@ -822,7 +840,7 @@ int Create(struct supertype *st, char *mddev,
                }
                bitmap_fd = open(s->bitmap_file, O_RDWR);
                if (bitmap_fd < 0) {
-                       pr_err("weird: %s cannot be openned\n",
+                       pr_err("weird: %s cannot be opened\n",
                                s->bitmap_file);
                        goto abort_locked;
                }
@@ -841,7 +859,6 @@ int Create(struct supertype *st, char *mddev,
                for (dnum = 0, raid_disk_num = 0, dv = devlist; dv;
                     dv = (dv->next) ? (dv->next) : moved_disk, dnum++) {
                        int fd;
-                       struct stat stb2;
                        struct mdinfo *inf = &infos[dnum];
 
                        if (dnum >= total_slots)
@@ -897,9 +914,10 @@ int Create(struct supertype *st, char *mddev,
                                                        dv->devname);
                                                goto abort_locked;
                                        }
-                                       fstat(fd, &stb2);
-                                       inf->disk.major = major(stb2.st_rdev);
-                                       inf->disk.minor = minor(stb2.st_rdev);
+                                       if (!fstat_is_blkdev(fd, dv->devname, &rdev))
+                                               return 1;
+                                       inf->disk.major = major(rdev);
+                                       inf->disk.minor = minor(rdev);
                                }
                                if (fd >= 0)
                                        remove_partitions(fd);
@@ -920,8 +938,8 @@ int Create(struct supertype *st, char *mddev,
 
                                if (!have_container) {
                                        /* getinfo_super might have lost these ... */
-                                       inf->disk.major = major(stb2.st_rdev);
-                                       inf->disk.minor = minor(stb2.st_rdev);
+                                       inf->disk.major = major(rdev);
+                                       inf->disk.minor = minor(rdev);
                                }
                                break;
                        case 2: