[patch] cciss: Fix problem that deleting multiple logical drives could cause a panic

scameron
2008-12-16T20:17:18Z

Fix problem that deleting multiple logical drives could cause a panic.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cca.cpqcorp.net>
---

drivers/block/cciss.c | 5 +++++
1 file changed, 5 insertions(+)

diff -puN drivers/block/cciss.c~fix_rebuild_lun_table_bug drivers/block/cciss.c
--- linux-2.6.28-rc8/drivers/block/cciss.c~fix_rebuild_lun_table_bug 2008-12-16 14:00:52.000000000 -0600
+++ linux-2.6.28-rc8-root/drivers/block/cciss.c 2008-12-16 14:00:52.000000000 -0600
@@ -1693,6 +1693,11 @@ static int rebuild_lun_table(ctlr_info_t
for (i = 0; i <= h->highest_lun; i++) {
int j;
drv_found = 0;
+
+ /* skip holes in the array from already deleted drives */
+ if (h->drv[i].raid_level == -1)
+ continue;
+
for (j = 0; j < num_luns; j++) {
memcpy(&lunid, &ld_buff->LUN[j][0], 4);
lunid = le32_to_cpu(lunid);
_