From: Chad Dupuis <chad.dupuis@qlogic.com>
To: Nicholas Mc Guire <hofrat@osadl.org>
Cc: "James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] bnx2fc: bnx2fc_io.c: match wait_for_completion_timeout return type
Date: Mon, 9 Mar 2015 09:54:50 -0400 [thread overview]
Message-ID: <alpine.OSX.2.00.1503090954290.364@administrators-macbook-pro.local> (raw)
In-Reply-To: <1425479238-11519-1-git-send-email-hofrat@osadl.org>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
On Wed, 4 Mar 2015, Nicholas Mc Guire wrote:
> return type of wait_for_completion_timeout is unsigned long not int. An
> appropriately named variable of type unsigned long is added and the
> assignments fixed up.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
> ---
>
> The was only compile tested with x86_64_defconfig + SCSI_LOWLEVEL
> CONFIG_SCSI_FC_ATTRS=m, CONFIG_LIBFC=m, CONFIG_LIBFCOE=m,
> CONFIG_SCSI_BNX2X_FCOE=m
>
> Patch is against 4.0-rc2 (localversion-next is -next-20150304)
>
> drivers/scsi/bnx2fc/bnx2fc_io.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
> index 9ecca85..77f8c1e 100644
> --- a/drivers/scsi/bnx2fc/bnx2fc_io.c
> +++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
> @@ -703,6 +703,7 @@ static int bnx2fc_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags)
> struct fcp_cmnd *fcp_cmnd;
> int task_idx, index;
> int rc = SUCCESS;
> + unsigned long time_left;
> u16 xid;
> u32 sid, did;
> unsigned long start = jiffies;
> @@ -810,7 +811,7 @@ retry_tmf:
> bnx2fc_ring_doorbell(tgt);
> spin_unlock_bh(&tgt->tgt_lock);
>
> - rc = wait_for_completion_timeout(&io_req->tm_done,
> + time_left = wait_for_completion_timeout(&io_req->tm_done,
> BNX2FC_TM_TIMEOUT * HZ);
> spin_lock_bh(&tgt->tgt_lock);
>
> @@ -824,17 +825,17 @@ retry_tmf:
> io_req->wait_for_comp = 1;
> bnx2fc_initiate_cleanup(io_req);
> spin_unlock_bh(&tgt->tgt_lock);
> - rc = wait_for_completion_timeout(&io_req->tm_done,
> + time_left = wait_for_completion_timeout(&io_req->tm_done,
> BNX2FC_FW_TIMEOUT);
> spin_lock_bh(&tgt->tgt_lock);
> io_req->wait_for_comp = 0;
> - if (!rc)
> + if (!time_left)
> kref_put(&io_req->refcount, bnx2fc_cmd_release);
> }
>
> spin_unlock_bh(&tgt->tgt_lock);
>
> - if (!rc) {
> + if (!time_left) {
> BNX2FC_TGT_DBG(tgt, "task mgmt command failed...\n");
> rc = FAILED;
> } else {
>
prev parent reply other threads:[~2015-03-09 13:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-04 14:27 [PATCH 2/2] bnx2fc: bnx2fc_io.c: match wait_for_completion_timeout return type Nicholas Mc Guire
2015-03-04 14:27 ` Nicholas Mc Guire
2015-03-09 13:54 ` Chad Dupuis [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.OSX.2.00.1503090954290.364@administrators-macbook-pro.local \
--to=chad.dupuis@qlogic.com \
--cc=JBottomley@parallels.com \
--cc=hofrat@osadl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox