Messages in this thread Patch in this message | | | From | Nicholas Mc Guire <> | Subject | [PATCH v3] scsi: mpt2sas: wait_for_completion_timeout timeout not reported | Date | Wed, 31 Dec 2014 03:54:13 -0500 |
| |
wait_for_completion_timeout reaching timeout was being ignored, this also should fail if timeout condition occurs.
v3: proper labeling and attribution - no change of actual patch
this was only compile tested with x86_64_defconfig + CONFIG_SCSI_LOWLEVEL=y, CONFIG_SCSI_MPT2SAS=m
patch is against linux-next 3.19.0-rc1 -next-20141226
Acked-by: Joe Lawrence <joe.lawrence@stratus.com> Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at> --- drivers/scsi/mpt2sas/mpt2sas_config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c index c72a2ff..02dc2d8 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_config.c +++ b/drivers/scsi/mpt2sas/mpt2sas_config.c @@ -391,7 +391,7 @@ _config_request(struct MPT2SAS_ADAPTER *ioc, Mpi2ConfigRequest_t mpt2sas_base_put_smid_default(ioc, smid); timeleft = wait_for_completion_timeout(&ioc->config_cmds.done, timeout*HZ); - if (!(ioc->config_cmds.status & MPT2_CMD_COMPLETE)) { + if (timeleft == 0 || !(ioc->config_cmds.status & MPT2_CMD_COMPLETE)) { printk(MPT2SAS_ERR_FMT "%s: timeout\n", ioc->name, __func__); _debug_dump_mf(mpi_request, -- 1.7.10.4
| |