[SCSI] mptfusion: Fix Incorrect return value in mptscsih_dev_reset
There's a branch at the end of this function that is supposed to normalize the return value with what the mid-layer expects. In this one case, we get it wrong. Also increase the verbosity of the INFO level printk at the end of mptscsih_abort to include the actual return value and the scmd->serial_number. The reason being success or failure is actually determined by the state of the internal tag list when a TMF is issued, and not the return value of the TMF cmd. The serial_number is also used in this decision, thus it's useful to know for debugging purposes. Cc: stable@kernel.org Reported-by: Peter M. Petrakis <peter.petrakis@canonical.com> Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
84857c8bf8
commit
bcfe42e980
1 changed files with 4 additions and 3 deletions
|
@ -1873,8 +1873,9 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
out:
|
||||||
printk(MYIOC_s_INFO_FMT "task abort: %s (sc=%p)\n",
|
printk(MYIOC_s_INFO_FMT "task abort: %s (rv=%04x) (sc=%p) (sn=%ld)\n",
|
||||||
ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), SCpnt);
|
ioc->name, ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), retval,
|
||||||
|
SCpnt, SCpnt->serial_number);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
@ -1911,7 +1912,7 @@ mptscsih_dev_reset(struct scsi_cmnd * SCpnt)
|
||||||
|
|
||||||
vdevice = SCpnt->device->hostdata;
|
vdevice = SCpnt->device->hostdata;
|
||||||
if (!vdevice || !vdevice->vtarget) {
|
if (!vdevice || !vdevice->vtarget) {
|
||||||
retval = SUCCESS;
|
retval = 0;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue