linux-next: build failure after merge of the target-updates tree

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 652 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/target/target_core_transport.c: In function 'transport_get_sense_buffer':
drivers/target/target_core_transport.c:582:22: error: 'struct target_core_fabric_ops' has no member named 'set_fabric_sense_len'

I can only assume that this has been caused by the (largish) changes that
went into Linus' tree recently conflicting with changes in the
target-updates tree.

I have dropped the target-updates tree for today.  Please sort the mess out.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

On Mon, 2012-09-17 at 13:41 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> After merging the target-updates tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/target/target_core_transport.c: In function 'transport_get_sense_buffer':
> drivers/target/target_core_transport.c:582:22: error: 'struct target_core_fabric_ops' has no member named 'set_fabric_sense_len'
> 
> I can only assume that this has been caused by the (largish) changes that
> went into Linus' tree recently conflicting with changes in the
> target-updates tree.
> 
> I have dropped the target-updates tree for today.  Please sort the mess out.

Hi Stephen,

Whoops, sorry about that..

So target-pending/for-next has been rebased + now includes the following
change to Roland's original patch that drops TFO->set_fabric_sense_len
core+fabric usage for v3.7-rc1.  As reported, this ended up conflicting
with Paolo's recent pSCSI backend sense data handling bug-fixes that
went in for v3.6-rc6.

So with the following, for-next should be looking as expected now.

Thanks!

--nab

diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index fd0d0f0..d6d4844 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -567,9 +567,7 @@ static void target_complete_failure_work(struct work_struct *work)
  */
 static unsigned char *transport_get_sense_buffer(struct se_cmd *cmd)
 {
-       unsigned char *buffer = cmd->sense_buffer;
        struct se_device *dev = cmd->se_dev;
-       u32 offset = 0;
 
        WARN_ON(!cmd->se_lun);
 
@@ -579,14 +577,11 @@ static unsigned char *transport_get_sense_buffer(struct se_cmd *cmd)
        if (cmd->se_cmd_flags & SCF_SENT_CHECK_CONDITION)
                return NULL;
 
-       offset = cmd->se_tfo->set_fabric_sense_len(cmd, TRANSPORT_SENSE_BUFFER);
-
-       /* Automatically padded */
-       cmd->scsi_sense_length = TRANSPORT_SENSE_BUFFER + offset;
+       cmd->scsi_sense_length = TRANSPORT_SENSE_BUFFER;
 
        pr_debug("HBA_[%u]_PLUG[%s]: Requesting sense for SAM STATUS: 0x%02x\n",
                dev->se_hba->hba_id, dev->transport->name, cmd->scsi_status);
-       return &buffer[offset];
+       return cmd->sense_buffer;
 }
 
 void target_complete_cmd(struct se_cmd *cmd, u8 scsi_status)

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/hwtracing/stm/policy.c:212:2: error: unknown field 'show_attribute' specified in initializer
  .show_attribute  = stp_policy_node_attr_show,
  ^
drivers/hwtracing/stm/policy.c:212:2: warning: initialization from incompatible pointer type
drivers/hwtracing/stm/policy.c:212:2: warning: (near initialization for 'stp_policy_node_item_ops.allow_link')
drivers/hwtracing/stm/policy.c:213:2: error: unknown field 'store_attribute' specified in initializer
  .store_attribute = stp_policy_node_attr_store,
  ^
drivers/hwtracing/stm/policy.c:213:2: warning: initialization from incompatible pointer type
drivers/hwtracing/stm/policy.c:213:2: warning: (near initialization for 'stp_policy_node_item_ops.drop_link')
drivers/hwtracing/stm/policy.c:353:2: error: unknown field 'show_attribute' specified in initializer
  .show_attribute  = stp_policy_attr_show,
  ^
drivers/hwtracing/stm/policy.c:353:2: warning: initialization from incompatible pointer type
drivers/hwtracing/stm/policy.c:353:2: warning: (near initialization for 'stp_policy_item_ops.allow_link')

Caused by commit

  7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")

from the char-misc tree interacting with commit

  f71933438300 ("configfs: remove old API")

I have reverted the target-updated commit for today.  If there is a
better resolution (and I assume that there is), please let me know.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

Re: linux-next: build failure after merge of the target-updates tree

[Alexander Shishkin]

Stephen Rothwell <sfr@canb.auug.org.au> writes:

> Caused by commit
>
>   7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
>
> from the char-misc tree interacting with commit
>
>   f71933438300 ("configfs: remove old API")
>
> I have reverted the target-updated commit for today.  If there is a
> better resolution (and I assume that there is), please let me know.

I'm going to follow up to this email with a fix that updates stm class
code to the new api, I'm not sure whos branch it should go to, because
it only works with Christoph's configfs patches in the -next.

Regards,
--
Alex

Re: linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

Hi Alexander,

On Wed, 07 Oct 2015 15:27:17 +0300 Alexander Shishkin <alexander.shishkin@linux.intel.com> wrote:
>
> Stephen Rothwell <sfr@canb.auug.org.au> writes:
> 
> > Caused by commit
> >
> >   7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
> >
> > from the char-misc tree interacting with commit
> >
> >   f71933438300 ("configfs: remove old API")
> >
> > I have reverted the target-updated commit for today.  If there is a
> > better resolution (and I assume that there is), please let me know.
> 
> I'm going to follow up to this email with a fix that updates stm class
> code to the new api, I'm not sure whos branch it should go to, because
> it only works with Christoph's configfs patches in the -next.

Well, I will add it as a merge resolution patch in linux-next (instead
of the current revert) but someone will have to remember to send it to
Linus when the latter of these two trees is merged by him.  Unless one
of these trees can merge the other (or a non rebasing subset) ...
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3892 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id_len':
drivers/target/target_core_fabric_lib.c:364:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
  case SCSI_PROTOCOL_FCP:
       ^
drivers/target/target_core_fabric_lib.c:364:7: note: each undeclared identifier is reported only once for each function it appears in
drivers/target/target_core_fabric_lib.c:365:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SBP:
       ^
drivers/target/target_core_fabric_lib.c:366:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SRP:
       ^
drivers/target/target_core_fabric_lib.c:367:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
  case SCSI_PROTOCOL_SAS:
       ^
drivers/target/target_core_fabric_lib.c:369:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
  case SCSI_PROTOCOL_ISCSI:
       ^
drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id':
drivers/target/target_core_fabric_lib.c:388:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
  case SCSI_PROTOCOL_SAS:
       ^
drivers/target/target_core_fabric_lib.c:390:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SBP:
       ^
drivers/target/target_core_fabric_lib.c:392:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SRP:
       ^
drivers/target/target_core_fabric_lib.c:394:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
  case SCSI_PROTOCOL_FCP:
       ^
drivers/target/target_core_fabric_lib.c:396:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
  case SCSI_PROTOCOL_ISCSI:
       ^
drivers/target/target_core_fabric_lib.c: In function 'target_parse_pr_out_transport_id':
drivers/target/target_core_fabric_lib.c:411:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
  case SCSI_PROTOCOL_SAS:
       ^
drivers/target/target_core_fabric_lib.c:418:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SBP:
       ^
drivers/target/target_core_fabric_lib.c:419:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
  case SCSI_PROTOCOL_SRP:
       ^
drivers/target/target_core_fabric_lib.c:420:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
  case SCSI_PROTOCOL_FCP:
       ^
drivers/target/target_core_fabric_lib.c:423:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
  case SCSI_PROTOCOL_ISCSI:
       ^

Caused by commit 2650d71e244f ("target: move transport ID handling to
the core") interacting with commit ba929992522b ("target: Minimize SCSI
header #include directives") from the scsi tree.

I have added this merge fix patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Jun 2015 18:10:46 +1000
Subject: [PATCH] target: explicitly include scsi_proto.h in target_core_fabric_lib.c

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/target/target_core_fabric_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
index b05578b5b4a0..cb6497ce4b61 100644
--- a/drivers/target/target_core_fabric_lib.c
+++ b/drivers/target/target_core_fabric_lib.c
@@ -35,6 +35,8 @@
 #include <linux/spinlock.h>
 #include <linux/export.h>
 
+#include <scsi/scsi_proto.h>
+
 #include <target/target_core_base.h>
 #include <target/target_core_fabric.h>
 
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[James Bottomley]

[-- Attachment #1: Type: text/plain, Size: 4422 bytes --]

On Wed, 2015-06-03 at 18:16 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> After merging the target-updates tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id_len':
> drivers/target/target_core_fabric_lib.c:364:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_FCP:
>        ^
> drivers/target/target_core_fabric_lib.c:364:7: note: each undeclared identifier is reported only once for each function it appears in
> drivers/target/target_core_fabric_lib.c:365:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SBP:
>        ^
> drivers/target/target_core_fabric_lib.c:366:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SRP:
>        ^
> drivers/target/target_core_fabric_lib.c:367:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SAS:
>        ^
> drivers/target/target_core_fabric_lib.c:369:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
>   case SCSI_PROTOCOL_ISCSI:
>        ^
> drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id':
> drivers/target/target_core_fabric_lib.c:388:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SAS:
>        ^
> drivers/target/target_core_fabric_lib.c:390:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SBP:
>        ^
> drivers/target/target_core_fabric_lib.c:392:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SRP:
>        ^
> drivers/target/target_core_fabric_lib.c:394:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_FCP:
>        ^
> drivers/target/target_core_fabric_lib.c:396:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
>   case SCSI_PROTOCOL_ISCSI:
>        ^
> drivers/target/target_core_fabric_lib.c: In function 'target_parse_pr_out_transport_id':
> drivers/target/target_core_fabric_lib.c:411:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SAS:
>        ^
> drivers/target/target_core_fabric_lib.c:418:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SBP:
>        ^
> drivers/target/target_core_fabric_lib.c:419:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_SRP:
>        ^
> drivers/target/target_core_fabric_lib.c:420:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
>   case SCSI_PROTOCOL_FCP:
>        ^
> drivers/target/target_core_fabric_lib.c:423:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
>   case SCSI_PROTOCOL_ISCSI:
>        ^
> 
> Caused by commit 2650d71e244f ("target: move transport ID handling to
> the core") interacting with commit ba929992522b ("target: Minimize SCSI
> header #include directives") from the scsi tree.
> 
> I have added this merge fix patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 3 Jun 2015 18:10:46 +1000
> Subject: [PATCH] target: explicitly include scsi_proto.h in target_core_fabric_lib.c
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/target/target_core_fabric_lib.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
> index b05578b5b4a0..cb6497ce4b61 100644
> --- a/drivers/target/target_core_fabric_lib.c
> +++ b/drivers/target/target_core_fabric_lib.c
> @@ -35,6 +35,8 @@
>  #include <linux/spinlock.h>
>  #include <linux/export.h>
>  
> +#include <scsi/scsi_proto.h>
> +
>  #include <target/target_core_base.h>
>  #include <target/target_core_fabric.h>

OK, this gives us a cross tree dependency on the SCSI header split
patches.  Nic, if you base your tree off this commit in mine, I'll make
sure to push early in the merge window.

commit ba929992522b6d1f866b7021bc50da66f8fdd743
Author: Bart Van Assche <bart.vanassche@sandisk.com>
Date:   Fri May 8 10:11:12 2015 +0200

    target: Minimize SCSI header #include directives

James


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

On Wed, 2015-06-03 at 13:00 -0700, James Bottomley wrote:
> On Wed, 2015-06-03 at 18:16 +1000, Stephen Rothwell wrote:
> > Hi Nicholas,
> > 
> > After merging the target-updates tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id_len':
> > drivers/target/target_core_fabric_lib.c:364:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_FCP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:364:7: note: each undeclared identifier is reported only once for each function it appears in
> > drivers/target/target_core_fabric_lib.c:365:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SBP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:366:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SRP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:367:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SAS:
> >        ^
> > drivers/target/target_core_fabric_lib.c:369:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_ISCSI:
> >        ^
> > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id':
> > drivers/target/target_core_fabric_lib.c:388:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SAS:
> >        ^
> > drivers/target/target_core_fabric_lib.c:390:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SBP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:392:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SRP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:394:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_FCP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:396:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_ISCSI:
> >        ^
> > drivers/target/target_core_fabric_lib.c: In function 'target_parse_pr_out_transport_id':
> > drivers/target/target_core_fabric_lib.c:411:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SAS:
> >        ^
> > drivers/target/target_core_fabric_lib.c:418:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SBP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:419:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_SRP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:420:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_FCP:
> >        ^
> > drivers/target/target_core_fabric_lib.c:423:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> >   case SCSI_PROTOCOL_ISCSI:
> >        ^
> > 
> > Caused by commit 2650d71e244f ("target: move transport ID handling to
> > the core") interacting with commit ba929992522b ("target: Minimize SCSI
> > header #include directives") from the scsi tree.
> > 
> > I have added this merge fix patch for today:
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Wed, 3 Jun 2015 18:10:46 +1000
> > Subject: [PATCH] target: explicitly include scsi_proto.h in target_core_fabric_lib.c
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/target/target_core_fabric_lib.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
> > index b05578b5b4a0..cb6497ce4b61 100644
> > --- a/drivers/target/target_core_fabric_lib.c
> > +++ b/drivers/target/target_core_fabric_lib.c
> > @@ -35,6 +35,8 @@
> >  #include <linux/spinlock.h>
> >  #include <linux/export.h>
> >  
> > +#include <scsi/scsi_proto.h>
> > +
> >  #include <target/target_core_base.h>
> >  #include <target/target_core_fabric.h>
> 
> OK, this gives us a cross tree dependency on the SCSI header split
> patches.  Nic, if you base your tree off this commit in mine, I'll make
> sure to push early in the merge window.
> 
> commit ba929992522b6d1f866b7021bc50da66f8fdd743
> Author: Bart Van Assche <bart.vanassche@sandisk.com>
> Date:   Fri May 8 10:11:12 2015 +0200
> 
>     target: Minimize SCSI header #include directives
> 

Rebasing one subsystem's for-next atop another subsystem's for-next is a
sure fire way to cause Linus to become irate.

But it's not even necessary here anyways, just fold Stephen's patch to
add scsi_proto.h to target_core_fabric_configfs.c into the original
change, and be done with it.

--nab

Re: linux-next: build failure after merge of the target-updates tree

[James Bottomley]

On Wed, 2015-06-03 at 15:12 -0700, Nicholas A. Bellinger wrote:
> On Wed, 2015-06-03 at 13:00 -0700, James Bottomley wrote:
> > On Wed, 2015-06-03 at 18:16 +1000, Stephen Rothwell wrote:
> > > Hi Nicholas,
> > > 
> > > After merging the target-updates tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id_len':
> > > drivers/target/target_core_fabric_lib.c:364:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_FCP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:364:7: note: each undeclared identifier is reported only once for each function it appears in
> > > drivers/target/target_core_fabric_lib.c:365:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SBP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:366:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SRP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:367:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SAS:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:369:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_ISCSI:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c: In function 'target_get_pr_transport_id':
> > > drivers/target/target_core_fabric_lib.c:388:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SAS:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:390:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SBP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:392:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SRP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:394:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_FCP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:396:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_ISCSI:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c: In function 'target_parse_pr_out_transport_id':
> > > drivers/target/target_core_fabric_lib.c:411:7: error: 'SCSI_PROTOCOL_SAS' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SAS:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:418:7: error: 'SCSI_PROTOCOL_SBP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SBP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:419:7: error: 'SCSI_PROTOCOL_SRP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_SRP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:420:7: error: 'SCSI_PROTOCOL_FCP' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_FCP:
> > >        ^
> > > drivers/target/target_core_fabric_lib.c:423:7: error: 'SCSI_PROTOCOL_ISCSI' undeclared (first use in this function)
> > >   case SCSI_PROTOCOL_ISCSI:
> > >        ^
> > > 
> > > Caused by commit 2650d71e244f ("target: move transport ID handling to
> > > the core") interacting with commit ba929992522b ("target: Minimize SCSI
> > > header #include directives") from the scsi tree.
> > > 
> > > I have added this merge fix patch for today:
> > > 
> > > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > > Date: Wed, 3 Jun 2015 18:10:46 +1000
> > > Subject: [PATCH] target: explicitly include scsi_proto.h in target_core_fabric_lib.c
> > > 
> > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > > ---
> > >  drivers/target/target_core_fabric_lib.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/drivers/target/target_core_fabric_lib.c b/drivers/target/target_core_fabric_lib.c
> > > index b05578b5b4a0..cb6497ce4b61 100644
> > > --- a/drivers/target/target_core_fabric_lib.c
> > > +++ b/drivers/target/target_core_fabric_lib.c
> > > @@ -35,6 +35,8 @@
> > >  #include <linux/spinlock.h>
> > >  #include <linux/export.h>
> > >  
> > > +#include <scsi/scsi_proto.h>
> > > +
> > >  #include <target/target_core_base.h>
> > >  #include <target/target_core_fabric.h>
> > 
> > OK, this gives us a cross tree dependency on the SCSI header split
> > patches.  Nic, if you base your tree off this commit in mine, I'll make
> > sure to push early in the merge window.
> > 
> > commit ba929992522b6d1f866b7021bc50da66f8fdd743
> > Author: Bart Van Assche <bart.vanassche@sandisk.com>
> > Date:   Fri May 8 10:11:12 2015 +0200
> > 
> >     target: Minimize SCSI header #include directives
> > 
> 
> Rebasing one subsystem's for-next atop another subsystem's for-next is a
> sure fire way to cause Linus to become irate.

No, he's fine with it (as long as the trees aren't entangled when
submitted). We used to do it all the time with the block and SCSI trees;
it's why the scsi postmerge tree existed.

> But it's not even necessary here anyways, just fold Stephen's patch to
> add scsi_proto.h to target_core_fabric_configfs.c into the original
> change, and be done with it.

I can certainly do that, but other updates to the target tree could
cause this problem to reoccur in different files.

James

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

On Wed, 2015-06-03 at 15:33 -0700, James Bottomley wrote:
> On Wed, 2015-06-03 at 15:12 -0700, Nicholas A. Bellinger wrote:
> > On Wed, 2015-06-03 at 13:00 -0700, James Bottomley wrote:

<SNIP>

> > > OK, this gives us a cross tree dependency on the SCSI header split
> > > patches.  Nic, if you base your tree off this commit in mine, I'll make
> > > sure to push early in the merge window.
> > > 
> > > commit ba929992522b6d1f866b7021bc50da66f8fdd743
> > > Author: Bart Van Assche <bart.vanassche@sandisk.com>
> > > Date:   Fri May 8 10:11:12 2015 +0200
> > > 
> > >     target: Minimize SCSI header #include directives
> > > 
> > 
> > Rebasing one subsystem's for-next atop another subsystem's for-next is a
> > sure fire way to cause Linus to become irate.
> 
> No, he's fine with it (as long as the trees aren't entangled when
> submitted). We used to do it all the time with the block and SCSI trees;
> it's why the scsi postmerge tree existed.
> 

...

> > But it's not even necessary here anyways, just fold Stephen's patch to
> > add scsi_proto.h to target_core_fabric_configfs.c into the original
> > change, and be done with it.
> 
> I can certainly do that, but other updates to the target tree could
> cause this problem to reoccur in different files.
> 

target_core_fabric_lib.c is the only place where SCSI_PROTOCOL_* is used
and I don't expect this to change before -rc1, so it should be OK to
just fold into the original.

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1190 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/target/sbp/sbp_target.c: In function 'sbp_get_lun_from_tpg':
drivers/target/sbp/sbp_target.c:186:17: error: 'struct se_portal_group' has no member named 'tpg_lun_list'
  se_lun = se_tpg->tpg_lun_list[lun];
                 ^
drivers/target/sbp/sbp_target.c: In function 'sbp_count_se_tpg_luns':
drivers/target/sbp/sbp_target.c:1833:30: error: 'struct se_portal_group' has no member named 'tpg_lun_list'
   struct se_lun *se_lun = tpg->tpg_lun_list[i];
                              ^
drivers/target/sbp/sbp_target.c: In function 'sbp_update_unit_directory':
drivers/target/sbp/sbp_target.c:1911:45: error: 'struct se_portal_group' has no member named 'tpg_lun_list'
   struct se_lun *se_lun = tport->tpg->se_tpg.tpg_lun_list[i];
                                             ^

Caused by commit 731bbd790f79 ("target: Convert se_tpg->tpg_lun_list to
->tpg_lun_hlist") which doesn't seem to be complete?

I have used the target-updates tree from next-20150511 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/target/target_core_user.c: In function 'tcmu_netlink_event':
drivers/target/target_core_user.c:780:2: error: expected ';' before 'ret'
  ret = nla_put_u32(skb, TCMU_ATTR_MINOR, minor);
  ^

Caused by commit 7f2ea21b2c8d ("target/user: Fix up smatch warnings in
tcmu_netlink_event").

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

On Fri, 2014-10-03 at 15:46 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> After merging the target-updates tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/target/target_core_user.c: In function 'tcmu_netlink_event':
> drivers/target/target_core_user.c:780:2: error: expected ';' before 'ret'
>   ret = nla_put_u32(skb, TCMU_ATTR_MINOR, minor);
>   ^
> 
> Caused by commit 7f2ea21b2c8d ("target/user: Fix up smatch warnings in
> tcmu_netlink_event").
> 
> I have reverted that commit for today.

Fixed.  Thank you Stephen.

--nab

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build
(powerpc ppc64_defconfig) failed like this:


drivers/scsi/virtio_scsi.c: In function 'virtio_scsi_init_hdr_pi':
drivers/scsi/virtio_scsi.c:491:48: error: dereferencing pointer to incomplete type
   cmd_pi->pi_bytesout = blk_rq_sectors(rq) * bi->tuple_size;
                                                ^
drivers/scsi/virtio_scsi.c:493:47: error: dereferencing pointer to incomplete type
   cmd_pi->pi_bytesin = blk_rq_sectors(rq) * bi->tuple_size;
                                               ^

Caused by commit 4baaa7d589e2 ("virtio-scsi: Enable DIF/DIX modes in
SCSI host LLD").  A missing include of linux/blkdev.h.  See Rule 1 in
Documentation/SubmitChecklist.

I have used the target-updates tree from next-20140522 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

Hi Stephen,

(Adding CC's for Paolo + MKP)

On Fri, 2014-05-23 at 19:11 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> After merging the target-updates tree, today's linux-next build
> (powerpc ppc64_defconfig) failed like this:
> 
> 
> drivers/scsi/virtio_scsi.c: In function 'virtio_scsi_init_hdr_pi':
> drivers/scsi/virtio_scsi.c:491:48: error: dereferencing pointer to incomplete type
>    cmd_pi->pi_bytesout = blk_rq_sectors(rq) * bi->tuple_size;
>                                                 ^
> drivers/scsi/virtio_scsi.c:493:47: error: dereferencing pointer to incomplete type
>    cmd_pi->pi_bytesin = blk_rq_sectors(rq) * bi->tuple_size;
>                                                ^
> 
> Caused by commit 4baaa7d589e2 ("virtio-scsi: Enable DIF/DIX modes in
> SCSI host LLD").  A missing include of linux/blkdev.h.  See Rule 1 in
> Documentation/SubmitChecklist.
> 
> I have used the target-updates tree from next-20140522 for today.

Whoops, adding the missing #include <linux/blkdev.h> now..

Thanks!

--nab

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3104 bytes --]

Hi Nicholas,

After merging the target-updates tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/target/target_core_iblock.c: In function 'iblock_alloc_bip':
drivers/target/target_core_iblock.c:646:5: error: 'struct bio_integrity_payload' has no member named 'bip_size'
  bip->bip_size = (cmd->data_length / dev->dev_attrib.block_size) *
     ^
drivers/target/target_core_iblock.c:648:5: error: 'struct bio_integrity_payload' has no member named 'bip_sector'
  bip->bip_sector = bio->bi_sector;
     ^
drivers/target/target_core_iblock.c:648:23: error: 'struct bio' has no member named 'bi_sector'
  bip->bip_sector = bio->bi_sector;
                       ^
In file included from include/linux/printk.h:243:0,
                 from include/linux/kernel.h:13,
                 from include/linux/cache.h:4,
                 from include/linux/time.h:4,
                 from include/linux/ktime.h:24,
                 from include/linux/timer.h:5,
                 from drivers/target/target_core_iblock.c:29:
drivers/target/target_core_iblock.c:650:52: error: 'struct bio_integrity_payload' has no member named 'bip_size'
  pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_size,
                                                    ^
drivers/target/target_core_iblock.c:651:27: error: 'struct bio_integrity_payload' has no member named 'bip_sector'
    (unsigned long long)bip->bip_sector);
                           ^

Caused by commit ecebbf6ccbca ("target/iblock: Add blk_integrity + BIP
passthrough support") interacting with commits 4f024f3797c4 ("block:
Abstract out bvec iterator") and d57a5f7c6605 ("bio-integrity: Convert to
bvec_iter") from the block tree.

I applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 20 Jan 2014 16:21:31 +1100
Subject: [PATCH] tagtet/iblock: merge for for bvec_iter changes

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/target/target_core_iblock.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index b7c64ef78338..554d4f75a75a 100644
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -643,12 +643,12 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio)
 		return -ENOMEM;
 	}
 
-	bip->bip_size = (cmd->data_length / dev->dev_attrib.block_size) *
+	bip->bip_iter.bi_size = (cmd->data_length / dev->dev_attrib.block_size) *
 			 dev->prot_length;
-	bip->bip_sector = bio->bi_sector;
+	bip->bip_iter.bi_sector = bio->bi_iter.bi_sector;
 
-	pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_size,
-		 (unsigned long long)bip->bip_sector);
+	pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_iter.bi_size,
+		 (unsigned long long)bip->bip_iter.bi_sector);
 
 	for_each_sg(cmd->t_prot_sg, sg, cmd->t_prot_nents, i) {
 
-- 
1.8.5.3

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: build failure after merge of the target-updates tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: build failure after merge of the target-updates tree

[Nicholas A. Bellinger]

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__,