From: "Nicholas A. Bellinger" <nab@linux-iscsi•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@infradead•org>
Subject: Re: linux-next: build failure after merge of the target-updates tree
Date: Thu, 09 Feb 2012 17:33:36 -0800 [thread overview]
Message-ID: <1328837616.9333.71.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <20120210115005.b828eca7065d1fbed82c80c6@canb.auug.org.au>
On Fri, 2012-02-10 at 11:50 +1100, Stephen Rothwell wrote:
> Hi Nicholas,
>
> After merging the target-updates tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/infiniband/ulp/srpt/ib_srpt.c: In function 'srpt_abort_cmd':
> drivers/infiniband/ulp/srpt/ib_srpt.c:1381:25: error: 'struct se_cmd' has no member named 'transport_lun_stop'
> drivers/infiniband/ulp/srpt/ib_srpt.c:1390:25: error: 'struct se_cmd' has no member named 'transport_lun_stop'
> drivers/infiniband/ulp/srpt/ib_srpt.c: In function 'srpt_handle_rdma_err_comp':
> drivers/infiniband/ulp/srpt/ib_srpt.c:1516:25: error: 'struct se_cmd' has no member named 'transport_lun_stop'
>
> Caused by commit 3f1d120476c5 ("target: replace various cmd flags with a
> transport state").
>
> I have used the target-updates tree from next-20120209 for today.
Whoops, I managed to drop the piece below from hch's original patch in
target-pending/for-next. Sorry about that..
Rolling the missing ib_srpt.c bit into the patch now..
Thanks Stephen!
--nab
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 2b73d43..e1e6b5b 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -1378,7 +1378,9 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
break;
case SRPT_STATE_NEED_DATA:
/* DMA_TO_DEVICE (write) - RDMA read error. */
- atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+ spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+ ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+ spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
transport_generic_handle_data(&ioctx->cmd);
break;
case SRPT_STATE_CMD_RSP_SENT:
@@ -1387,7 +1389,9 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)
* not been received in time.
*/
srpt_unmap_sg_to_ib_sge(ioctx->ch, ioctx);
- atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+ spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+ ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+ spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
kref_put(&ioctx->kref, srpt_put_send_ioctx_kref);
break;
case SRPT_STATE_MGMT_RSP_SENT:
@@ -1494,6 +1498,7 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
{
struct se_cmd *cmd;
enum srpt_command_state state;
+ unsigned long flags;
cmd = &ioctx->cmd;
state = srpt_get_cmd_state(ioctx);
@@ -1513,7 +1518,9 @@ static void srpt_handle_rdma_err_comp(struct srpt_rdma_ch *ch,
__func__, __LINE__, state);
break;
case SRPT_RDMA_WRITE_LAST:
- atomic_set(&ioctx->cmd.transport_lun_stop, 1);
+ spin_lock_irqsave(&ioctx->cmd.t_state_lock, flags);
+ ioctx->cmd.transport_state |= CMD_T_LUN_STOP;
+ spin_unlock_irqrestore(&ioctx->cmd.t_state_lock, flags);
break;
default:
printk(KERN_ERR "%s[%d]: opcode = %u\n", __func__,
next prev parent reply other threads:[~2012-02-10 1:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-10 0:50 linux-next: build failure after merge of the target-updates tree Stephen Rothwell
2012-02-10 1:33 ` Nicholas A. Bellinger [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-09-17 3:41 Stephen Rothwell
2012-09-18 0:57 ` Nicholas A. Bellinger
2014-01-20 5:25 Stephen Rothwell
2014-05-23 9:11 Stephen Rothwell
2014-05-23 17:38 ` Nicholas A. Bellinger
2014-10-03 5:46 Stephen Rothwell
2014-10-03 8:10 ` Nicholas A. Bellinger
2015-05-12 4:54 Stephen Rothwell
2015-06-03 8:16 Stephen Rothwell
2015-06-03 20:00 ` James Bottomley
2015-06-03 22:12 ` Nicholas A. Bellinger
2015-06-03 22:33 ` James Bottomley
2015-06-03 22:46 ` Nicholas A. Bellinger
2015-10-07 3:49 Stephen Rothwell
2015-10-07 12:27 ` Alexander Shishkin
2015-10-07 20:22 ` Stephen Rothwell
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=1328837616.9333.71.camel@haakon2.linux-iscsi.org \
--to=nab@linux-iscsi$(echo .)org \
--cc=hch@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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