cciss updates for 2.6 [11 of 11]

From: mikem
Date: Wed Feb 04 2004 - 19:47:06 EST


Patch 11 of 11 (finally).
This patch fixes an Oops when unloading the driver. Bug fix.
Please consider this for inclusion.

All of the patches sent out are needed to get the driver in the 2.6 tree
up to the level of the driver that is in the 2.4 tree, excluding this
patch which is not required in 2.4.
More patches will be coming. They include multi-path failover support,
support for more than 8 controllers, and msi support. Presently working on
a per logical volume queueing scheme.
Please forgive me for flooding your inboxes.
--------------------------------------------------------------------------------------
diff -burN lx262-p010/drivers/block/cciss.c lx262/drivers/block/cciss.c
--- lx262-p010/drivers/block/cciss.c 2004-02-04 12:44:52.000000000 -0600
+++ lx262/drivers/block/cciss.c 2004-02-04 12:46:44.000000000 -0600
@@ -2668,7 +2668,6 @@
pci_set_drvdata(pdev, NULL);
iounmap((void*)hba[i]->vaddr);
cciss_unregister_scsi(i); /* unhook from SCSI subsystem */
- blk_cleanup_queue(hba[i]->queue);
unregister_blkdev(COMPAQ_CISS_MAJOR+i, hba[i]->devname);
remove_proc_entry(hba[i]->devname, proc_cciss);

@@ -2679,6 +2678,7 @@
del_gendisk(disk);
}

+ blk_cleanup_queue(hba[i]->queue);
pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct),
hba[i]->cmd_pool, hba[i]->cmd_pool_dhandle);
pci_free_consistent(hba[i]->pdev, NR_CMDS * sizeof( ErrorInfo_struct),

Thanks,
mikem
mike.miller@xxxxxx

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/