| Message ID | 1445283641-7358-7-git-send-email-chad.dupuis@qlogic.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On 19.10.2015 21:40, Chad Dupuis wrote: > Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> > Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> > --- > drivers/scsi/bnx2fc/bnx2fc.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h > index d46267d..d05866d 100644 > --- a/drivers/scsi/bnx2fc/bnx2fc.h > +++ b/drivers/scsi/bnx2fc/bnx2fc.h > @@ -129,7 +129,7 @@ > #define BNX2FC_MAX_FCP_TGT 256 > #define BNX2FC_MAX_CMD_LEN 16 > > -#define BNX2FC_TM_TIMEOUT 60 /* secs */ > +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */ Hi Chad, when you add HZ here it should be removed from bnx2fc_initiate_tmf : rc = wait_for_completion_timeout(&io_req->tm_done, BNX2FC_TM_TIMEOUT * HZ); Cheers, Tomas > #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */ > > #define BNX2FC_WAIT_CNT 1200 -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 20 Oct 2015, Tomas Henzl wrote: > On 19.10.2015 21:40, Chad Dupuis wrote: >> Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> >> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> >> --- >> drivers/scsi/bnx2fc/bnx2fc.h | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h >> index d46267d..d05866d 100644 >> --- a/drivers/scsi/bnx2fc/bnx2fc.h >> +++ b/drivers/scsi/bnx2fc/bnx2fc.h >> @@ -129,7 +129,7 @@ >> #define BNX2FC_MAX_FCP_TGT 256 >> #define BNX2FC_MAX_CMD_LEN 16 >> >> -#define BNX2FC_TM_TIMEOUT 60 /* secs */ >> +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */ > > Hi Chad, > when you add HZ here it should be removed from bnx2fc_initiate_tmf : > rc = wait_for_completion_timeout(&io_req->tm_done, > BNX2FC_TM_TIMEOUT * HZ); > Cheers, > Tomas Yeah, you're right...no need for this patch then. Self nack on this one. > >> #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */ >> >> #define BNX2FC_WAIT_CNT 1200 > > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/19/2015 09:40 PM, Chad Dupuis wrote: > Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> > Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> > --- > drivers/scsi/bnx2fc/bnx2fc.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h > index d46267d..d05866d 100644 > --- a/drivers/scsi/bnx2fc/bnx2fc.h > +++ b/drivers/scsi/bnx2fc/bnx2fc.h > @@ -129,7 +129,7 @@ > #define BNX2FC_MAX_FCP_TGT 256 > #define BNX2FC_MAX_CMD_LEN 16 > > -#define BNX2FC_TM_TIMEOUT 60 /* secs */ > +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */ > #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */ > > #define BNX2FC_WAIT_CNT 1200 > Retracted, so no review :-) Cheers, Hannes
diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h index d46267d..d05866d 100644 --- a/drivers/scsi/bnx2fc/bnx2fc.h +++ b/drivers/scsi/bnx2fc/bnx2fc.h @@ -129,7 +129,7 @@ #define BNX2FC_MAX_FCP_TGT 256 #define BNX2FC_MAX_CMD_LEN 16 -#define BNX2FC_TM_TIMEOUT 60 /* secs */ +#define BNX2FC_TM_TIMEOUT (60 * HZ) /* seconds */ #define BNX2FC_IO_TIMEOUT 20000UL /* msecs */ #define BNX2FC_WAIT_CNT 1200