Commit 9ecd953a authored Apr 23, 2015 by Robert Elliott Committed by James Bottomley May 31, 2015

hpsa: cleanup for init_one step 2 in kdump



In hpsa_undo_allocations_after_kdump_soft_reset,
the things allocated in hpsa_init_one step 2 -
h->resubmit_wq and h->lockup_detected  need to
be freed, in the right order.

Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Reviewed-by: Hannes Reinecke <hare@Suse.de>
Signed-off-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: James Bottomley <JBottomley@Odin.com>

parent d498757c

drivers/scsi/hpsa.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -7376,6 +7376,16 @@ static void hpsa_undo_allocations_after_kdump_soft_reset(struct ctlr_info *h)
		hpsa_free_cmd_pool(h); /* init_one 5 */
		hpsa_free_irqs(h); /* init_one 4 */
		hpsa_free_pci_init(h); /* init_one 3 */
		free_percpu(h->lockup_detected); /* init_one 2 */
		h->lockup_detected = NULL; /* init_one 2 */
		if (h->resubmit_wq) {
		destroy_workqueue(h->resubmit_wq); /* init_one 1 */
		h->resubmit_wq = NULL;
		}
		if (h->rescan_ctlr_wq) {
		destroy_workqueue(h->rescan_ctlr_wq);
		h->rescan_ctlr_wq = NULL;
		}
		kfree(h); /* init_one 1 */
		}