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

Conflicts:
	super-intel.c

diff --cc mdadm.h
Simple merge

diff --cc super-intel.c
index 609aaf51a04dcf28fb595ce82a9c522b0031999f,14e15218fc848d39f3aaad185d7d512ec1d7e8bb..d6951cc2ff7c72a578e7de2c733fde387eed0f08
--- 1/super-intel.c
--- 2/super-intel.c
+++ b/super-intel.c
@@@ -4081,9 -3836,8 +4095,9 @@@ static struct mdinfo *container_content
                        ord = get_imsm_ord_tbl_ent(dev, slot); 
                        for (d = super->disks; d ; d = d->next)
                                if (d->index == idx)
-                                         break;
+                                       break;
  
 +                      recovery_start = MaxSector;
                        if (d == NULL)
                                skip = 1;
                        if (d && is_failed(&d->disk))
@@@ -4133,11 -3878,7 +4147,9 @@@
                        info_d->events = __le32_to_cpu(mpb->generation_num);
                        info_d->data_offset = __le32_to_cpu(map->pba_of_lba0);
                        info_d->component_size = __le32_to_cpu(map->blocks_per_member);
-                       if (d->devname)
-                               strcpy(info_d->name, d->devname);
                }
 +              /* now that the disk list is up-to-date fixup recovery_start */
 +              update_recovery_start(dev, this);
                rest = this;
        }
  

diff --cc sysfs.c
index c3bbbe32b1fca1ff0a4a6a02a339aafa20cd3632,1d15ff64b40585c694dc0e2abb29e0d84018330f..ebf9d8a65646d1e42ab28bac2c134c523eb58bc2
--- 1/sysfs.c
--- 2/sysfs.c
+++ b/sysfs.c
@@@ -572,10 -567,10 +567,10 @@@ int sysfs_set_array(struct mdinfo *info
        return rv;
  }
  
 -int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int in_sync)
 +int sysfs_add_disk(struct mdinfo *sra, struct mdinfo *sd, int resume)
  {
-       char dv[100];
-       char nm[100];
+       char dv[PATH_MAX];
+       char nm[PATH_MAX];
        char *dname;
        int rv;