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

Commit e9ca75b5 authored by Gerald Britton's avatar Gerald Britton Committed by Linus Torvalds
Browse files

cciss: Fix pci_driver.shutdown while device is still active 



Fix an Oops in the cciss driver caused by system shutdown while a filesystem
on a cciss device is still active.  The cciss_remove_one function only
properly removes the device if the device has been cleanly released by its
users, which is not the case when the pci_driver.shutdown method is called.

This patch adds a new cciss_shutdown function to better match the pattern
used by various SCSI drivers: deactivate device interrupts and flush caches.
It also alters the cciss_remove_one function to match and readds the
__devexit annotation that was removed when cciss_remove_one was serving as
the pci_driver.shutdown method.

Signed-off-by: default avatarGerald Britton <gbritton@alum.mit.edu>
Acked-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dec04cff

drivers/block/cciss.c

+30 −15
Original line number Diff line number Diff line
@@ -3469,13 +3469,39 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, 
	return -1;

}



static void cciss_remove_one(struct pci_dev *pdev)

static void cciss_shutdown(struct pci_dev *pdev)

{

	ctlr_info_t *tmp_ptr;

	int i, j;

	int i;

	char flush_buf[4];

	int return_code;



	tmp_ptr = pci_get_drvdata(pdev);

	if (tmp_ptr == NULL)

		return;

	i = tmp_ptr->ctlr;

	if (hba[i] == NULL)

		return;



	/* Turn board interrupts off  and send the flush cache command */

	/* sendcmd will turn off interrupt, and send the flush...

	 * To write all data in the battery backed cache to disks */

	memset(flush_buf, 0, 4);

	return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,

			      TYPE_CMD);

	if (return_code == IO_OK) {

		printk(KERN_INFO "Completed flushing cache on controller %d\n", i);

	} else {

		printk(KERN_WARNING "Error flushing cache on controller %d\n", i);

	}

	free_irq(hba[i]->intr[2], hba[i]);

}



static void __devexit cciss_remove_one(struct pci_dev *pdev)

{

	ctlr_info_t *tmp_ptr;

	int i, j;



	if (pci_get_drvdata(pdev) == NULL) {

		printk(KERN_ERR "cciss: Unable to remove device \n");

		return;
@@ -3506,18 +3532,7 @@ static void cciss_remove_one(struct pci_dev *pdev) 


	cciss_unregister_scsi(i);	/* unhook from SCSI subsystem */



	/* Turn board interrupts off  and send the flush cache command */

	/* sendcmd will turn off interrupt, and send the flush...

	 * To write all data in the battery backed cache to disks */

	memset(flush_buf, 0, 4);

	return_code = sendcmd(CCISS_CACHE_FLUSH, i, flush_buf, 4, 0, 0, 0, NULL,

			      TYPE_CMD);

	if (return_code == IO_OK) {

		printk(KERN_INFO "Completed flushing cache on controller %d\n", i);

	} else {

		printk(KERN_WARNING "Error flushing cache on controller %d\n", i);

	}

	free_irq(hba[i]->intr[2], hba[i]);

	cciss_shutdown(pdev);



#ifdef CONFIG_PCI_MSI

	if (hba[i]->msix_vector)
@@ -3550,7 +3565,7 @@ static struct pci_driver cciss_pci_driver = { 
	.probe = cciss_init_one,

	.remove = __devexit_p(cciss_remove_one),

	.id_table = cciss_pci_device_id,	/* id_table */

	.shutdown = cciss_remove_one,

	.shutdown = cciss_shutdown,

};



/*