From: NeilBrown <neilb@suse.de>
Date: Mon, 13 Dec 2010 03:00:05 +0000 (+1100)
Subject: Merge branch 'master' into devel-3.2
X-Git-Tag: mdadm-3.2~186
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=1d54f2867b928bb1c3374f269599b8cbcb293193

Merge branch 'master' into devel-3.2

Conflicts:
	super-intel.c
---

1d54f2867b928bb1c3374f269599b8cbcb293193
diff --cc super-intel.c
index 29438988,b3a116f9..38f96225
--- a/super-intel.c
+++ b/super-intel.c
@@@ -4202,14 -4119,10 +4202,15 @@@ static void default_geometry_imsm(struc
  {
  	struct intel_super *super = st->sb;
  
 -	if (!super || !super->orom)
 -		return 0;
 +	if (level && *level == UnSet)
 +		*level = LEVEL_CONTAINER;
 +
 +	if (level && layout && *layout == UnSet)
 +		*layout = imsm_level_to_layout(*level);
  
- 	if (chunk && (*chunk == UnSet || *chunk == 0) && super->orom)
 -	return imsm_orom_default_chunk(super->orom);
++	if (chunk && (*chunk == UnSet || *chunk == 0) && 
++	    super && super->orom)
 +		*chunk = imsm_orom_default_chunk(super->orom);
  }
  
  static void handle_missing(struct intel_super *super, struct imsm_dev *dev);