On 04/16/2015 03:49 PM, Don Brace wrote:
> From: Robert Elliott <elliott@xxxxxx>
>
> 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@xxxxxxxx>
> Reviewed-by: Kevin Barnett <kevin.barnett@xxxxxxxx>
> Signed-off-by: Robert Elliott <elliott@xxxxxx>
> Signed-off-by: Don Brace <don.brace@xxxxxxxx>
> ---
> drivers/scsi/hpsa.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
> index dc8299c..99fd4d3 100644
> --- a/drivers/scsi/hpsa.c
> +++ b/drivers/scsi/hpsa.c
> @@ -7395,6 +7395,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 */
> }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Reviewed-by: Hannes Reinecke <hare@xxxxxxx>
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
hare@xxxxxxx +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
