| Message ID | 20171130034047.15070-3-himanshu.madhani@cavium.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On 11/30/2017 04:40 AM, Himanshu Madhani wrote: > From: Quinn Tran <quinn.tran@cavium.com> > > Stop GPNID command from advancing if command has failed. > > Fixes: 726b85487067d ("qla2xxx: Add framework for async fabric discovery") > Cc: <stable@vger.kernel.org> # 4.10+ > Signed-off-by: Quinn Tran <quinn.tran@cavium.com> > Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> > --- > drivers/scsi/qla2xxx/qla_gs.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c > index bc3db6abc9a0..ddc69d36877e 100644 > --- a/drivers/scsi/qla2xxx/qla_gs.c > +++ b/drivers/scsi/qla2xxx/qla_gs.c > @@ -3211,6 +3211,11 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res) > sp->name, res, ct_req->req.port_id.port_id, > ct_rsp->rsp.gpn_id.port_name); > > + if (res) { > + sp->free(sp); > + return; > + } > + > memset(&ea, 0, sizeof(ea)); > memcpy(ea.port_name, ct_rsp->rsp.gpn_id.port_name, WWN_SIZE); > ea.sp = sp; > Reviewed-by: Hannes Reinecke <hare@suse.com> Cheers, Hannes
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c index bc3db6abc9a0..ddc69d36877e 100644 --- a/drivers/scsi/qla2xxx/qla_gs.c +++ b/drivers/scsi/qla2xxx/qla_gs.c @@ -3211,6 +3211,11 @@ static void qla2x00_async_gpnid_sp_done(void *s, int res) sp->name, res, ct_req->req.port_id.port_id, ct_rsp->rsp.gpn_id.port_name); + if (res) { + sp->free(sp); + return; + } + memset(&ea, 0, sizeof(ea)); memcpy(ea.port_name, ct_rsp->rsp.gpn_id.port_name, WWN_SIZE); ea.sp = sp;