Messages in this thread Patch in this message | | | Subject | [PATCH 2 1/4] cciss: remove logical drive sysfs entries during driver cleanup. | From | Andrew Patterson <> | Date | Tue, 21 Jul 2009 13:55:22 -0600 |
| |
cciss: remove logical drive sysfs entries during driver cleanup.
Sysfs entries for logical drives need to be removed when a drive is deleted during driver cleanup.
Acked-by: Mike Miller <mike.miller@hp.com> Signed-off-by: Andrew Patterson <andrew.patterson@hp.com> ---
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index a52cc7f..970c896 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -1977,7 +1977,6 @@ static int rebuild_lun_table(ctlr_info_t *h, int first_time) h->drv[i].busy_configuring = 1; spin_unlock_irqrestore(CCISS_LOCK(h->ctlr), flags); return_code = deregister_disk(h, i, 1); - cciss_destroy_ld_sysfs_entry(&h->drv[i]); h->drv[i].busy_configuring = 0; } } @@ -2118,6 +2117,7 @@ static int deregister_disk(ctlr_info_t *h, int drv_index, * indicate that this element of the drive * array is free. */ + cciss_destroy_ld_sysfs_entry(drv); if (clear_all) { /* check to see if it was the last disk */ @@ -4141,6 +4141,9 @@ static void __devexit cciss_remove_one(struct pci_dev *pdev) if (q) blk_cleanup_queue(q); } + if (hba[i]->drv[j].raid_level != -1) + cciss_destroy_ld_sysfs_entry(&hba[i]->drv[j]); + } #ifdef CONFIG_CISS_SCSI_TAPE
| |