On 12/30/2014 11:19 AM, Nicholas Mc Guire wrote:
> wait_for_completion_timeout reaching timeout was being ignored,
> this also should fail if timeout condition occurs.
>
> Thanks to Joe Lawrence <joe.lawrence@xxxxxxxxxxx> for confirmation.
How about this instead:
Acked-by: Joe Lawrence <joe.lawrence@xxxxxxxxxxx>
You still probably want a review from the Avago folks though.
BTW, don't worry about the "[SCSI]" subject prefix to the commit,
"[PATCH]" is fine. I believe the former is a convention that the
maintainer applies to patches as he collects them to indicate that they
originated via the SCSI tree.
Thanks,
-- Joe
> this was only compile tested with
> x86_64_defconfig + CONFIG_SCSI_LOWLEVEL=y + CONFIG_SCSI_MPT3SAS=m
>
> patch is against linux-next 3.19.0-rc1 -next-20141226
> Signed-off-by: Nicholas Mc Guire <der.herr@xxxxxxx>
> ---
> drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
> index 4472c2a..04ff21b 100644
> --- a/drivers/scsi/mpt3sas/mpt3sas_config.c
> +++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
> @@ -393,7 +393,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
> mpt3sas_base_put_smid_default(ioc, smid);
> timeleft = wait_for_completion_timeout(&ioc->config_cmds.done,
> timeout*HZ);
> - if (!(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
> + if (timeleft == 0 || !(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
> pr_err(MPT3SAS_FMT "%s: timeout\n",
> ioc->name, __func__);
> _debug_dump_mf(mpi_request,
>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
