| Message ID | 20150416134941.30238.68476.stgit@brunhilda (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 04/16/2015 03:49 PM, Don Brace wrote: > From: Robert Elliott <elliott@hp.com> > > 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> > Signed-off-by: Robert Elliott <elliott@hp.com> > Signed-off-by: Don Brace <don.brace@pmcs.com> > --- > 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@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Reviewed-by: Hannes Reinecke <hare@suse.de> Cheers, Hannes
On 04/16/2015 03:49 PM, Don Brace wrote: > From: Robert Elliott <elliott@hp.com> > > 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> > Signed-off-by: Robert Elliott <elliott@hp.com> > Signed-off-by: Don Brace <don.brace@pmcs.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Tomas -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 */ }