Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c64bebcd authored by Andrew Patterson's avatar Andrew Patterson Committed by Jens Axboe
Browse files

cciss: Remove sysfs entries for logical drives on driver cleanup.



Sysfs entries for logical drives need to be removed when a drive is
deleted during driver cleanup.

Signed-off-by: default avatarAndrew Patterson <andrew.patterson@hp.com>
Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4d761609
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -1978,7 +1978,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;
		}
	}
@@ -2119,6 +2118,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 */
@@ -4142,6 +4142,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