Merge branch 'master' of git://github.com/djbw/mdadm

diff --combined super-intel.c
index 73b1db7e4c4a6ac4b5f8f40eee5a21d9e0543f23,10956e6cf046f0ca9d2d637c1f081da79958e0ef..b413435d27634c65e36c30bf71dc3b7891149d8a
--- 1/super-intel.c
--- 2/super-intel.c
+++ b/super-intel.c
@@@ -243,7 -243,6 +243,6 @@@ struct intel_super 
        void *next_buf; /* for realloc'ing buf from the manager */
        size_t next_len;
        int updates_pending; /* count of pending updates for mdmon */
-       int creating_imsm; /* flag to indicate container creation */
        int current_vol; /* index of raid device undergoing creation */
        __u32 create_offset; /* common start for 'current_vol' */
        __u32 random; /* random data for seeding new family numbers */
@@@ -1453,7 -1452,6 +1452,7 @@@ static void getinfo_super_imsm_volume(s
        info->component_size      = __le32_to_cpu(map->blocks_per_member);
        memset(info->uuid, 0, sizeof(info->uuid));
        info->recovery_start = MaxSector;
 +      info->reshape_active = 0;
  
        if (map->map_state == IMSM_T_STATE_UNINITIALIZED || dev->vol.dirty) {
                info->resync_start = 0;
@@@ -2297,13 -2295,12 +2296,12 @@@ static void free_super_imsm(struct supe
        st->sb = NULL;
  }
  
- static struct intel_super *alloc_super(int creating_imsm)
+ static struct intel_super *alloc_super(void)
  {
        struct intel_super *super = malloc(sizeof(*super));
  
        if (super) {
                memset(super, 0, sizeof(*super));
-               super->creating_imsm = creating_imsm;
                super->current_vol = -1;
                super->create_offset = ~((__u32 ) 0);
                if (!check_env("IMSM_NO_PLATFORM"))
@@@ -2709,7 -2706,7 +2707,7 @@@ static int load_super_imsm_all(struct s
        }
        /* load all mpbs */
        for (sd = sra->devs, i = 0; sd; sd = sd->next, i++) {
-               struct intel_super *s = alloc_super(0);
+               struct intel_super *s = alloc_super();
                char nm[32];
                int dfd;
  
@@@ -2802,7 -2799,7 +2800,7 @@@ static int load_super_imsm(struct super
  
        free_super_imsm(st);
  
-       super = alloc_super(0);
+       super = alloc_super();
        if (!super) {
                fprintf(stderr,
                        Name ": malloc of %zu failed.\n",
@@@ -3076,7 -3073,7 +3074,7 @@@ static int init_super_imsm(struct super
        else
                mpb_size = 512;
  
-       super = alloc_super(1);
+       super = alloc_super();
        if (super && posix_memalign(&super->buf, 512, mpb_size) != 0) {
                free(super);
                super = NULL;
@@@ -3211,10 -3208,7 +3209,7 @@@ static int add_to_super_imsm(struct sup
        dd->fd = fd;
        dd->e = NULL;
        rv = imsm_read_serial(fd, devname, dd->serial);
-       if (rv && check_env("IMSM_DEVNAME_AS_SERIAL")) {
-               memset(dd->serial, 0, MAX_RAID_SERIAL_LEN);
-               fd2devname(fd, (char *) dd->serial);
-       } else if (rv) {
+       if (rv) {
                fprintf(stderr,
                        Name ": failed to retrieve scsi serial, aborting\n");
                free(dd);