mirror of https://gitee.com/openkylin/linux.git
[SCSI] mptfusion: Task abort is not supported for Volumes
1) corrected return value as SUCCESS instead of 0. 2) Added check in mptscsih_abort. mptfusion do not support task abort for Volumes. Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
08f5c5c23d
commit
69b2e9b443
|
@ -1723,6 +1723,7 @@ mptscsih_get_tm_timeout(MPT_ADAPTER *ioc)
|
|||
case FC:
|
||||
return 40;
|
||||
case SAS:
|
||||
return 30;
|
||||
case SPI:
|
||||
default:
|
||||
return 10;
|
||||
|
@ -1772,7 +1773,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
|
|||
ioc->name, SCpnt));
|
||||
SCpnt->result = DID_NO_CONNECT << 16;
|
||||
SCpnt->scsi_done(SCpnt);
|
||||
retval = 0;
|
||||
retval = SUCCESS;
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
@ -1787,6 +1788,17 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
|
|||
goto out;
|
||||
}
|
||||
|
||||
/* Task aborts are not supported for volumes.
|
||||
*/
|
||||
if (vdevice->vtarget->raidVolume) {
|
||||
dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
|
||||
"task abort: raid volume (sc=%p)\n",
|
||||
ioc->name, SCpnt));
|
||||
SCpnt->result = DID_RESET << 16;
|
||||
retval = FAILED;
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Find this command
|
||||
*/
|
||||
if ((scpnt_idx = SCPNT_TO_LOOKUP_IDX(ioc, SCpnt)) < 0) {
|
||||
|
|
Loading…
Reference in New Issue