Remove spaces/tabs from ends of lines.

[thirdparty/mdadm.git] / super0.c

diff --git a/super0.c b/super0.c
index 757d9056672b2f1110acbdae5ea2d08da19fde73..2a2938dfdd8c4aa0253059e25e8849660745d3e4 100644 (file)
--- a/super0.c
+++ b/super0.c
@@ -38,7 +38,7 @@
  *   - initialising a new superblock
  *   - printing the superblock for --examine
  *   - printing part of the superblock for --detail
- * .. other stuff 
+ * .. other stuff
  */
 
 
@@ -56,7 +56,7 @@ static unsigned long calc_sb0_csum(mdp_super_t *super)
 void super0_swap_endian(struct mdp_superblock_s *sb)
 {
        /* as super0 superblocks are host-endian, it is sometimes
-        * useful to be able to swap the endianness 
+        * useful to be able to swap the endianness
         * as (almost) everything is u32's we byte-swap every 4byte
         * number.
         * We then also have to swap the events_hi and events_lo
@@ -110,6 +110,9 @@ static void examine_super0(void *sbv, char *homehost)
        } else
                printf("           UUID : %08x\n", sb->set_uuid0);
 
+       if (sb->not_persistent)
+               printf("           Eedk : not persistent\n");
+
        atime = sb->ctime;
        printf("  Creation Time : %.24s\n", ctime(&atime));
        c=map_num(pers, sb->level);
@@ -277,6 +280,18 @@ static void brief_detail_super0(void *sbv)
        else
                printf("%08x", sb->set_uuid0);
 }
+
+static void export_super0(void *sbv)
+{
+       mdp_super_t *sb = sbv;
+       printf("MD_UUID=");
+       if (sb->minor_version >= 90)
+               printf("%08x:%08x:%08x:%08x", sb->set_uuid0, sb->set_uuid1,
+                      sb->set_uuid2, sb->set_uuid3);
+       else
+               printf("%08x", sb->set_uuid0);
+       printf("\n");
+}
 #endif
 
 static int match_home0(void *sbv, char *homehost)
@@ -388,14 +403,14 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
        if (strcmp(update, "summaries") == 0) {
                int i;
                /* set nr_disks, active_disks, working_disks,
-                * failed_disks, spare_disks based on disks[] 
+                * failed_disks, spare_disks based on disks[]
                 * array in superblock.
                 * Also make sure extra slots aren't 'failed'
                 */
                sb->nr_disks = sb->active_disks =
                        sb->working_disks = sb->failed_disks =
                        sb->spare_disks = 0;
-               for (i=0; i < MD_SB_DISKS ; i++) 
+               for (i=0; i < MD_SB_DISKS ; i++)
                        if (sb->disks[i].major ||
                            sb->disks[i].minor) {
                                int state = sb->disks[i].state;
@@ -444,7 +459,16 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
                        rv = 1;
                }
        }
-       if (strcmp(update, "grow") == 0) {
+       if (strcmp(update, "linear-grow-new") == 0) {
+               memset(&sb->disks[info->disk.number], 0, sizeof(sb->disks[0]));
+               sb->disks[info->disk.number].number = info->disk.number;
+               sb->disks[info->disk.number].major = info->disk.major;
+               sb->disks[info->disk.number].minor = info->disk.minor;
+               sb->disks[info->disk.number].raid_disk = info->disk.raid_disk;
+               sb->disks[info->disk.number].state = info->disk.state;
+               sb->this_disk = sb->disks[info->disk.number];
+       }
+       if (strcmp(update, "linear-grow-update") == 0) {
                sb->raid_disks = info->array.raid_disks;
                sb->nr_disks = info->array.nr_disks;
                sb->active_disks = info->array.active_disks;
@@ -455,8 +479,6 @@ static int update_super0(struct mdinfo *info, void *sbv, char *update,
                sb->disks[info->disk.number].minor = info->disk.minor;
                sb->disks[info->disk.number].raid_disk = info->disk.raid_disk;
                sb->disks[info->disk.number].state = info->disk.state;
-               if (sb->this_disk.number == info->disk.number)
-                       sb->this_disk = sb->disks[info->disk.number];
        }
        if (strcmp(update, "resync") == 0) {
                /* make sure resync happens */
@@ -602,7 +624,7 @@ static int store_super0(struct supertype *st, int fd, void *sbv)
        if (!get_dev_size(fd, NULL, &dsize))
                return 1;
 
-       if (dsize < MD_RESERVED_SECTORS*2*512)
+       if (dsize < MD_RESERVED_SECTORS*512)
                return 2;
 
        offset = MD_NEW_SIZE_SECTORS(dsize>>9);
@@ -700,20 +722,20 @@ static int load_super0(struct supertype *st, int fd, void **sbp, char *devname)
         *  1 on cannot get superblock
         *  2 on superblock meaningless
         */
-       unsigned long size;
        unsigned long long dsize;
        unsigned long long offset;
        mdp_super_t *super;
        int uuid[4];
        struct bitmap_super_s *bsb;
-    
+
        if (!get_dev_size(fd, devname, &dsize))
                return 1;
 
-       if (dsize < MD_RESERVED_SECTORS*512 * 2) {
+       if (dsize < MD_RESERVED_SECTORS*512) {
                if (devname)
-                       fprintf(stderr, Name ": %s is too small for md: size is %ld sectors.\n",
-                               devname, size);
+                       fprintf(stderr, Name
+                           ": %s is too small for md: size is %llu sectors.\n",
+                               devname, dsize);
                return 1;
        }
 
@@ -813,7 +835,7 @@ static struct supertype *match_metadata_desc0(char *arg)
 
 static __u64 avail_size0(struct supertype *st, __u64 devsize)
 {
-       if (devsize < MD_RESERVED_SECTORS*2)
+       if (devsize < MD_RESERVED_SECTORS)
                return 0ULL;
        return MD_NEW_SIZE_SECTORS(devsize);
 }
@@ -871,7 +893,7 @@ void locate_bitmap0(struct supertype *st, int fd, void *sbv)
        if (!get_dev_size(fd, NULL, &dsize))
                return;
 
-       if (dsize < MD_RESERVED_SECTORS*512 * 2)
+       if (dsize < MD_RESERVED_SECTORS*512)
                return;
 
        offset = MD_NEW_SIZE_SECTORS(dsize>>9);
@@ -888,7 +910,7 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv)
        unsigned long long dsize;
        unsigned long long offset;
        mdp_super_t *sb = sbv;
-    
+
        int rv = 0;
 
        int towrite, n;
@@ -898,8 +920,8 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv)
                return 1;
 
 
-       if (dsize < MD_RESERVED_SECTORS*512 * 2)
-       return -1;
+       if (dsize < MD_RESERVED_SECTORS*512)
+               return -1;
 
        offset = MD_NEW_SIZE_SECTORS(dsize>>9);
 
@@ -916,7 +938,7 @@ int write_bitmap0(struct supertype *st, int fd, void *sbv)
        memset(buf, 0xff, sizeof(buf));
        while (towrite > 0) {
                n = towrite;
-               if (n > sizeof(buf)) 
+               if (n > sizeof(buf))
                        n = sizeof(buf);
                n = write(fd, buf, n);
                if (n > 0)
@@ -937,6 +959,7 @@ struct superswitch super0 = {
        .brief_examine_super = brief_examine_super0,
        .detail_super = detail_super0,
        .brief_detail_super = brief_detail_super0,
+       .export_super = export_super0,
 #endif
        .match_home = match_home0,
        .uuid_from_super = uuid_from_super0,