The patch titled cciss: remove logical drive sysfs entries during driver cleanup has been added to the -mm tree. Its filename is cciss-remove-logical-drive-sysfs-entries-during-driver-cleanup.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cciss: remove logical drive sysfs entries during driver cleanup From: Andrew Patterson <andrew.patterson@xxxxxx> Sysfs entries for logical drives need to be removed when a drive is deleted during driver cleanup. Acked-by: Mike Miller <mike.miller@xxxxxx> Signed-off-by: Andrew Patterson <andrew.patterson@xxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/block/cciss.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN drivers/block/cciss.c~cciss-remove-logical-drive-sysfs-entries-during-driver-cleanup drivers/block/cciss.c --- a/drivers/block/cciss.c~cciss-remove-logical-drive-sysfs-entries-during-driver-cleanup +++ a/drivers/block/cciss.c @@ -1977,7 +1977,6 @@ static int rebuild_lun_table(ctlr_info_t 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 * * 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(s 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 _ Patches currently in -mm which might be from andrew.patterson@xxxxxx are cciss-remove-logical-drive-sysfs-entries-during-driver-cleanup.patch cciss-use-only-one-scan-thread.patch cciss-kick-off-logical-drive-topology-rescan-through-sysfs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html