commit 35dd3039e09cd46ca3a8733ff1c817bf7b7b19ce
author Stephen M. Cameron <StephenM.Cameron> Thu Dec 16 13:01:03 2010 -0600
committer James Bottomley <James.Bottomley@suse.de> Tue Dec 21 12:37:27 2010 -0600
tree fc7454921c9e873efa14216204fdba871a03ec6c
parent a0b89872b305bd0f6f5af1dd26274a3f057a2303

[SCSI] hpsa: do not consider RAID level to be part of device identity

Otherwise, after doing a RAID level migration, the disk will be
disruptively removed and re-added as a different disk on rescan.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

drivers/scsi/hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index a2408e5..12deffc 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -657,8 +657,6 @@
 		return 0;
 	if (dev1->devtype != dev2->devtype)
 		return 0;
-	if (dev1->raid_level != dev2->raid_level)
-		return 0;
 	if (dev1->bus != dev2->bus)
 		return 0;
 	return 1;