Remove spaces/tabs from ends of lines.

[thirdparty/mdadm.git] / Create.c

diff --git a/Create.c b/Create.c
index 08972ae1b7703b3e2069e8584324b6ad025c123d..fec7567f0d1b95219570c233a5bda49066627b35 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -73,7 +73,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        unsigned long long bitmapsize;
 
        mdu_array_info_t array;
-       int major = BITMAP_MAJOR_HI;
+       int major_num = BITMAP_MAJOR_HI;
 
        memset(&array, 0, sizeof(array));
 
@@ -111,6 +111,11 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                        Name ": at least 2 raid-devices needed for level 4 or 5\n");
                return 1;
        }
+       if (level <= 0 && sparedisks) {
+               fprintf(stderr,
+                       Name ": This level does not support spare devices\n");
+               return 1;
+       }
        if (subdevs > raiddisks+sparedisks) {
                fprintf(stderr, Name ": You have listed more devices (%d) than are in the array(%d)!\n", subdevs, raiddisks+sparedisks);
                return 1;
@@ -167,20 +172,25 @@ int Create(struct supertype *st, char *mddev, int mdfd,
        case 10:
        case 6:
        case 0:
-       case -1: /* linear */
+       case LEVEL_LINEAR: /* linear */
                if (chunk == 0) {
                        chunk = 64;
                        if (verbose > 0)
                                fprintf(stderr, Name ": chunk size defaults to 64K\n");
                }
                break;
-       default: /* raid1, multipath */
+       case 1:
+       case LEVEL_FAULTY:
+       case LEVEL_MULTIPATH:
                if (chunk) {
                        chunk = 0;
                        if (verbose > 0)
                                fprintf(stderr, Name ": chunk size ignored for this level\n");
                }
                break;
+       default:
+               fprintf(stderr, Name ": unknown level %d\n", level);
+               return 1;
        }
 
        /* now look at the subdevs */
@@ -288,7 +298,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                if (level > 0 || level == LEVEL_MULTIPATH || level == LEVEL_FAULTY) {
                        /* size is meaningful */
                        if (minsize > 0x100000000ULL && st->ss->major == 0) {
-                               fprintf(stderr, Name ": devices too large for RAID level %d\n", level); 
+                               fprintf(stderr, Name ": devices too large for RAID level %d\n", level);
                                return 1;
                        }
                        size = minsize;
@@ -315,12 +325,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
        }
 
-       /* If this is  raid5, we want to configure the last active slot
+       /* If this is raid4/5, we want to configure the last active slot
         * as missing, so that a reconstruct happens (faster than re-parity)
         * FIX: Can we do this for raid6 as well?
         */
        if (assume_clean==0 && force == 0 && first_missing >= raiddisks) {
                switch ( level ) {
+               case 4:
                case 5:
                        insert_point = raiddisks-1;
                        sparedisks++;
@@ -331,7 +342,13 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                        break;
                }
        }
-       
+
+       if (level <= 0 && first_missing != subdevs * 2) {
+               fprintf(stderr,
+                       Name ": This level does not support missing devices\n");
+               return 1;
+       }
+
        /* Ok, lets try some ioctls */
 
        array.level = level;
@@ -345,7 +362,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                array.md_minor = minor(stb.st_rdev);
        array.not_persistent = 0;
        /*** FIX: Need to do something about RAID-6 here ***/
-       if ( ( (level == 5) &&
+       if ( ( (level == 4 || level == 5) &&
               (insert_point < raiddisks || first_missing < raiddisks) )
             ||
             ( level == 6 && missing_disks == 2)
@@ -421,7 +438,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                return 1;
 
        if (bitmap_file && vers < 9003) {
-               major = BITMAP_MAJOR_HOSTENDIAN;
+               major_num = BITMAP_MAJOR_HOSTENDIAN;
 #ifdef __BIG_ENDIAN
                fprintf(stderr, Name ": Warning - bitmaps created on this kernel are not portable\n"
                        "  between different architectured.  Consider upgrading the Linux kernel.\n");
@@ -435,7 +452,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                }
                if (!st->ss->add_internal_bitmap(st, super, &bitmap_chunk,
                                                 delay, write_behind,
-                                                bitmapsize, 1, major)) {
+                                                bitmapsize, 1, major_num)) {
                        fprintf(stderr, Name ": Given bitmap chunk size not supported.\n");
                        return 1;
                }
@@ -450,7 +467,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                inf.major_version = st->ss->major;
                inf.minor_version = st->minor_version;
                rv = ioctl(mdfd, SET_ARRAY_INFO, &inf);
-       } else 
+       } else
                rv = ioctl(mdfd, SET_ARRAY_INFO, NULL);
        if (rv) {
                fprintf(stderr, Name ": SET_ARRAY_INFO failed for %s: %s\n",
@@ -465,7 +482,7 @@ int Create(struct supertype *st, char *mddev, int mdfd,
                if (CreateBitmap(bitmap_file, force, (char*)uuid, bitmap_chunk,
                                 delay, write_behind,
                                 bitmapsize,
-                                major)) {
+                                major_num)) {
                        return 1;
                }
                bitmap_fd = open(bitmap_file, O_RDWR);