From: NeilBrown <neilb@suse.de>
Date: Wed, 30 Dec 2009 02:46:52 +0000 (+1100)
Subject: Merge branch 'klockwork' of git://github.com/djbw/mdadm
X-Git-Tag: mdadm-3.1.2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8409bc51e828bdf748138882e89229d6f6080b7c;p=thirdparty%2Fmdadm.git

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

Conflicts:
	super-intel.c
---

8409bc51e828bdf748138882e89229d6f6080b7c
diff --cc super-intel.c
index 609aaf51,14e15218..d6951cc2
--- a/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 c3bbbe32,1d15ff64..ebf9d8a6
--- a/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;