* git-scsi-misc build error
@ 2007-07-31 22:27 Andrew Morton
2007-07-31 22:30 ` James Bottomley
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2007-07-31 22:27 UTC (permalink / raw)
To: James Bottomley, FUJITA Tomonori; +Cc: linux-scsi
ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
This bug was reported about seven times against 2.6.23-rc1-mm1's
git-scsi-target, and now it has been moved into git-scsi-misc.
From: Andrew Morton <akpm@linux-foundation.org>
- Fix this:
ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
- Also avoid anonymous args in the function prototypes: adding the names has
commentary value, and makes it easier to check the stubbed inline function
against the out-of-line declaration.
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: FUJITA Tomonori <tomof@acm.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
include/scsi/scsi_tgt.h | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff -puN include/scsi/scsi_tgt.h~scsi-fix-build-for-config_scsi_tgt=n include/scsi/scsi_tgt.h
--- a/include/scsi/scsi_tgt.h~scsi-fix-build-for-config_scsi_tgt=n
+++ a/include/scsi/scsi_tgt.h
@@ -17,5 +17,20 @@ extern int scsi_tgt_tsk_mgmt_request(str
extern struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *,
enum dma_data_direction, gfp_t);
extern void scsi_host_put_command(struct Scsi_Host *, struct scsi_cmnd *);
-extern int scsi_tgt_it_nexus_create(struct Scsi_Host *, u64, char *);
-extern int scsi_tgt_it_nexus_destroy(struct Scsi_Host *, u64);
+
+#ifdef CONFIG_SCSI_TGT
+extern int scsi_tgt_it_nexus_create(struct Scsi_Host *shost, u64 itn_id,
+ char *initiator);
+extern int scsi_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id);
+#else
+static inline int scsi_tgt_it_nexus_create(struct Scsi_Host *shost,
+ u64 itn_id, char *initiator)
+{
+ return 0;
+}
+
+static inline int scsi_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id)
+{
+ return 0;
+}
+#endif
_
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-scsi-misc build error
2007-07-31 22:27 git-scsi-misc build error Andrew Morton
@ 2007-07-31 22:30 ` James Bottomley
2007-07-31 22:41 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: James Bottomley @ 2007-07-31 22:30 UTC (permalink / raw)
To: Andrew Morton; +Cc: FUJITA Tomonori, linux-scsi
On Tue, 2007-07-31 at 15:27 -0700, Andrew Morton wrote:
> ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
> ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
>
> This bug was reported about seven times against 2.6.23-rc1-mm1's
> git-scsi-target, and now it has been moved into git-scsi-misc.
Yes ... Tomo's on the hook for a better fix, which is promised.
James
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-scsi-misc build error
2007-07-31 22:30 ` James Bottomley
@ 2007-07-31 22:41 ` Andrew Morton
2007-07-31 22:46 ` James Bottomley
2007-08-01 22:22 ` FUJITA Tomonori
0 siblings, 2 replies; 5+ messages in thread
From: Andrew Morton @ 2007-07-31 22:41 UTC (permalink / raw)
To: James Bottomley; +Cc: FUJITA Tomonori, linux-scsi
On Tue, 31 Jul 2007 17:30:52 -0500
James Bottomley <James.Bottomley@SteelEye.com> wrote:
> On Tue, 2007-07-31 at 15:27 -0700, Andrew Morton wrote:
> > ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
> > ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
> >
> > This bug was reported about seven times against 2.6.23-rc1-mm1's
> > git-scsi-target, and now it has been moved into git-scsi-misc.
>
> Yes ... Tomo's on the hook for a better fix, which is promised.
>
mutter.
Please, nothing which uses Kconfig `select'. They regularly go wrong.
Please copy me on that fix so I know when to drop this one.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-scsi-misc build error
2007-07-31 22:41 ` Andrew Morton
@ 2007-07-31 22:46 ` James Bottomley
2007-08-01 22:22 ` FUJITA Tomonori
1 sibling, 0 replies; 5+ messages in thread
From: James Bottomley @ 2007-07-31 22:46 UTC (permalink / raw)
To: Andrew Morton; +Cc: FUJITA Tomonori, linux-scsi
On Tue, 2007-07-31 at 15:41 -0700, Andrew Morton wrote:
> On Tue, 31 Jul 2007 17:30:52 -0500
> James Bottomley <James.Bottomley@SteelEye.com> wrote:
>
> > On Tue, 2007-07-31 at 15:27 -0700, Andrew Morton wrote:
> > > ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
> > > ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
> > >
> > > This bug was reported about seven times against 2.6.23-rc1-mm1's
> > > git-scsi-target, and now it has been moved into git-scsi-misc.
> >
> > Yes ... Tomo's on the hook for a better fix, which is promised.
> >
>
> mutter.
>
> Please, nothing which uses Kconfig `select'. They regularly go wrong.
He has explicit instructions on that point.
> Please copy me on that fix so I know when to drop this one.
Will do.
James
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: git-scsi-misc build error
2007-07-31 22:41 ` Andrew Morton
2007-07-31 22:46 ` James Bottomley
@ 2007-08-01 22:22 ` FUJITA Tomonori
1 sibling, 0 replies; 5+ messages in thread
From: FUJITA Tomonori @ 2007-08-01 22:22 UTC (permalink / raw)
To: akpm; +Cc: James.Bottomley, tomof, linux-scsi, fujita.tomonori
On Tue, 31 Jul 2007 15:41:34 -0700
Andrew Morton <akpm@linux-foundation.org> wrote:
> On Tue, 31 Jul 2007 17:30:52 -0500
> James Bottomley <James.Bottomley@SteelEye.com> wrote:
>
> > On Tue, 2007-07-31 at 15:27 -0700, Andrew Morton wrote:
> > > ERROR: "scsi_tgt_it_nexus_create" [drivers/scsi/scsi_transport_srp.ko] undefined!
> > > ERROR: "scsi_tgt_it_nexus_destroy" [drivers/scsi/scsi_transport_srp.ko] undefined!
> > >
> > > This bug was reported about seven times against 2.6.23-rc1-mm1's
> > > git-scsi-target, and now it has been moved into git-scsi-misc.
> >
> > Yes ... Tomo's on the hook for a better fix, which is promised.
> >
>
> mutter.
>
> Please, nothing which uses Kconfig `select'. They regularly go wrong.
>
> Please copy me on that fix so I know when to drop this one.
Really sorry about this issue that I should have fixed a long time
ago. The following patch was merged to scsi-misc. Hopefully it will
fix the issue.
---
>From 00924b31df30e4ddcf9ba9b5082171e5e46b9eb0 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 2 Aug 2007 00:03:11 +0900
Subject: [PATCH] scsi_transport_srp: remove tgt dependencies
it's better to remove tgt dependencies in srp transport class since
most people want only initiator support.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
drivers/scsi/Kconfig | 11 +++++++++--
drivers/scsi/scsi_transport_srp.c | 10 +++++-----
drivers/scsi/scsi_transport_srp_internal.h | 25 +++++++++++++++++++++++++
3 files changed, 39 insertions(+), 7 deletions(-)
create mode 100644 drivers/scsi/scsi_transport_srp_internal.h
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 4562273..7877dfd 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -291,11 +291,18 @@ source "drivers/scsi/libsas/Kconfig"
config SCSI_SRP_ATTRS
tristate "SRP Transport Attributes"
- depends on SCSI && SCSI_TGT
+ depends on SCSI
help
If you wish to export transport-specific information about
each attached SRP device to sysfs, say Y.
+config SCSI_SRP_TGT_ATTRS
+ bool "SCSI target support for SRP Transport Attributes"
+ depends on SCSI_SRP_ATTRS
+ depends on SCSI_TGT = y || SCSI_TGT = SCSI_SRP_ATTRS
+ help
+ If you want to use SCSI target mode drivers enable this option.
+
endmenu
menuconfig SCSI_LOWLEVEL
@@ -848,7 +855,7 @@ config SCSI_IBMVSCSI
config SCSI_IBMVSCSIS
tristate "IBM Virtual SCSI Server support"
- depends on PPC_PSERIES && SCSI_TGT && SCSI_SRP && SCSI_SRP_ATTRS
+ depends on PPC_PSERIES && SCSI_SRP && SCSI_SRP_TGT_ATTRS
help
This is the SRP target driver for IBM pSeries virtual environments.
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index cdd001a..430501e 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -30,7 +30,7 @@
#include <scsi/scsi_host.h>
#include <scsi/scsi_transport.h>
#include <scsi/scsi_transport_srp.h>
-#include <scsi/scsi_tgt.h>
+#include "scsi_transport_srp_internal.h"
struct srp_host_attrs {
atomic_t next_port_id;
@@ -223,8 +223,8 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
}
if (ids->roles == SRP_RPORT_ROLE_INITIATOR) {
- ret = scsi_tgt_it_nexus_create(shost, (unsigned long)rport,
- rport->port_id);
+ ret = srp_tgt_it_nexus_create(shost, (unsigned long)rport,
+ rport->port_id);
if (ret) {
device_del(&rport->dev);
transport_destroy_device(&rport->dev);
@@ -251,8 +251,8 @@ void srp_rport_del(struct srp_rport *rport)
struct device *dev = &rport->dev;
if (rport->roles == SRP_RPORT_ROLE_INITIATOR)
- scsi_tgt_it_nexus_destroy(dev_to_shost(dev->parent),
- (unsigned long)rport);
+ srp_tgt_it_nexus_destroy(dev_to_shost(dev->parent),
+ (unsigned long)rport);
transport_remove_device(dev);
device_del(dev);
diff --git a/drivers/scsi/scsi_transport_srp_internal.h b/drivers/scsi/scsi_transport_srp_internal.h
new file mode 100644
index 0000000..8a79747
--- /dev/null
+++ b/drivers/scsi/scsi_transport_srp_internal.h
@@ -0,0 +1,25 @@
+#include <scsi/scsi_tgt.h>
+
+#ifdef CONFIG_SCSI_SRP_TGT_ATTRS
+static inline int srp_tgt_it_nexus_create(struct Scsi_Host *shost, u64 itn_id,
+ char *initiator)
+{
+ return scsi_tgt_it_nexus_create(shost, itn_id, initiator);
+}
+
+static inline int srp_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id)
+{
+ return scsi_tgt_it_nexus_destroy(shost, itn_id);
+}
+
+#else
+static inline int srp_tgt_it_nexus_create(struct Scsi_Host *shost, u64 itn_id,
+ char *initiator)
+{
+ return 0;
+}
+static inline int srp_tgt_it_nexus_destroy(struct Scsi_Host *shost, u64 itn_id)
+{
+ return 0;
+}
+#endif
--
1.5.2.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-08-01 22:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-31 22:27 git-scsi-misc build error Andrew Morton
2007-07-31 22:30 ` James Bottomley
2007-07-31 22:41 ` Andrew Morton
2007-07-31 22:46 ` James Bottomley
2007-08-01 22:22 ` FUJITA Tomonori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).