* [PATCH] target: do not include target_core_mib.h under include/target
@ 2011-01-18 20:24 Christoph Hellwig
2011-01-18 20:24 ` [PATCH] target: remove EXTRA_CFLAGS Christoph Hellwig
2011-01-18 20:58 ` [PATCH] target: do not include target_core_mib.h under include/target Nicholas A. Bellinger
0 siblings, 2 replies; 6+ messages in thread
From: Christoph Hellwig @ 2011-01-18 20:24 UTC (permalink / raw)
To: nab; +Cc: linux-scsi
Headers under include/ should not include headers that require a specific
include path. Fix this by moving the defintion of scsi_port_stats to
target_core_base.h, and including target_core_mib.h directly where needed.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/drivers/target/target_core_configfs.c
===================================================================
--- linux-2.6.orig/drivers/target/target_core_configfs.c 2011-01-18 21:16:49.361253237 +0100
+++ linux-2.6/drivers/target/target_core_configfs.c 2011-01-18 21:17:03.393006207 +0100
@@ -51,6 +51,7 @@
#include "target_core_hba.h"
#include "target_core_pr.h"
#include "target_core_rd.h"
+#include "target_core_mib.h"
static struct list_head g_tf_list;
static struct mutex g_tf_lock;
Index: linux-2.6/drivers/target/target_core_hba.c
===================================================================
--- linux-2.6.orig/drivers/target/target_core_hba.c 2011-01-18 21:17:15.067253727 +0100
+++ linux-2.6/drivers/target/target_core_hba.c 2011-01-18 21:17:26.881255543 +0100
@@ -43,6 +43,7 @@
#include <target/target_core_transport.h>
#include "target_core_hba.h"
+#include "target_core_mib.h"
static LIST_HEAD(subsystem_list);
static DEFINE_MUTEX(subsystem_mutex);
Index: linux-2.6/drivers/target/target_core_mib.h
===================================================================
--- linux-2.6.orig/drivers/target/target_core_mib.h 2011-01-18 21:15:59.708253238 +0100
+++ linux-2.6/drivers/target/target_core_mib.h 2011-01-18 21:16:13.016005995 +0100
@@ -13,13 +13,6 @@ struct scsi_index_table {
u32 scsi_mib_index[SCSI_INDEX_TYPE_MAX];
} ____cacheline_aligned;
-/* SCSI Port stats */
-struct scsi_port_stats {
- u64 cmd_pdus;
- u64 tx_data_octets;
- u64 rx_data_octets;
-} ____cacheline_aligned;
-
extern int init_scsi_target_mib(void);
extern void remove_scsi_target_mib(void);
extern void init_scsi_index_table(void);
Index: linux-2.6/drivers/target/target_core_tpg.c
===================================================================
--- linux-2.6.orig/drivers/target/target_core_tpg.c 2011-01-18 21:17:38.542004530 +0100
+++ linux-2.6/drivers/target/target_core_tpg.c 2011-01-18 21:17:49.480291791 +0100
@@ -45,6 +45,7 @@
#include <target/target_core_fabric_ops.h>
#include "target_core_hba.h"
+#include "target_core_mib.h"
/* core_clear_initiator_node_from_tpg():
*
Index: linux-2.6/drivers/target/target_core_transport.c
===================================================================
--- linux-2.6.orig/drivers/target/target_core_transport.c 2011-01-18 21:18:00.593253587 +0100
+++ linux-2.6/drivers/target/target_core_transport.c 2011-01-18 21:18:08.858255404 +0100
@@ -58,6 +58,7 @@
#include "target_core_pr.h"
#include "target_core_scdb.h"
#include "target_core_ua.h"
+#include "target_core_mib.h"
/* #define DEBUG_CDB_HANDLER */
#ifdef DEBUG_CDB_HANDLER
Index: linux-2.6/include/target/target_core_base.h
===================================================================
--- linux-2.6.orig/include/target/target_core_base.h 2011-01-18 21:14:57.945011025 +0100
+++ linux-2.6/include/target/target_core_base.h 2011-01-18 21:20:44.166015774 +0100
@@ -8,7 +8,6 @@
#include <scsi/scsi_cmnd.h>
#include <net/sock.h>
#include <net/tcp.h>
-#include "target_core_mib.h"
#define TARGET_CORE_MOD_VERSION "v4.0.0-rc6"
#define SHUTDOWN_SIGS (sigmask(SIGKILL)|sigmask(SIGINT)|sigmask(SIGABRT))
@@ -175,6 +174,13 @@ struct se_obj {
atomic_t obj_access_count;
} ____cacheline_aligned;
+/* SCSI Port stats */
+struct scsi_port_stats {
+ u64 cmd_pdus;
+ u64 tx_data_octets;
+ u64 rx_data_octets;
+} ____cacheline_aligned;
+
/*
* Used by TCM Core internally to signal if ALUA emulation is enabled or
* disabled, or running in with TCM/pSCSI passthrough mode
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] target: remove EXTRA_CFLAGS
2011-01-18 20:24 [PATCH] target: do not include target_core_mib.h under include/target Christoph Hellwig
@ 2011-01-18 20:24 ` Christoph Hellwig
2011-01-18 20:59 ` Nicholas A. Bellinger
2011-01-18 20:58 ` [PATCH] target: do not include target_core_mib.h under include/target Nicholas A. Bellinger
1 sibling, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2011-01-18 20:24 UTC (permalink / raw)
To: nab; +Cc: linux-scsi
Add the current directory is superflous in general, and no includes in
drivers/scsi are needed either.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/drivers/target/Makefile
===================================================================
--- linux-2.6.orig/drivers/target/Makefile 2011-01-18 21:13:15.835261618 +0100
+++ linux-2.6/drivers/target/Makefile 2011-01-18 21:14:31.908284597 +0100
@@ -1,4 +1,3 @@
-EXTRA_CFLAGS += -I$(srctree)/drivers/target/ -I$(srctree)/drivers/scsi/
target_core_mod-y := target_core_configfs.o \
target_core_device.o \
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target: remove EXTRA_CFLAGS
2011-01-18 20:24 ` [PATCH] target: remove EXTRA_CFLAGS Christoph Hellwig
@ 2011-01-18 20:59 ` Nicholas A. Bellinger
2011-01-18 21:20 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-18 20:59 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-scsi
On Tue, 2011-01-18 at 21:24 +0100, Christoph Hellwig wrote:
> Add the current directory is superflous in general, and no includes in
> drivers/scsi are needed either.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
>
Committed as c524eda into lio-core-2.6.git and picked into
scsi-post-merge-2.6.git/for-jejb.
Thanks!
--nab
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target: remove EXTRA_CFLAGS
2011-01-18 20:59 ` Nicholas A. Bellinger
@ 2011-01-18 21:20 ` Christoph Hellwig
2011-01-18 21:31 ` Nicholas A. Bellinger
0 siblings, 1 reply; 6+ messages in thread
From: Christoph Hellwig @ 2011-01-18 21:20 UTC (permalink / raw)
To: Nicholas A. Bellinger; +Cc: linux-scsi
On Tue, Jan 18, 2011 at 12:59:16PM -0800, Nicholas A. Bellinger wrote:
> On Tue, 2011-01-18 at 21:24 +0100, Christoph Hellwig wrote:
> > Add the current directory is superflous in general, and no includes in
> > drivers/scsi are needed either.
> >
> > Signed-off-by: Christoph Hellwig <hch@lst.de>
> >
>
> Committed as c524eda into lio-core-2.6.git and picked into
> scsi-post-merge-2.6.git/for-jejb.
tcm_mod_builder.py should get a similar treatment, but I'm not python
savy enough to not fuck that up.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target: remove EXTRA_CFLAGS
2011-01-18 21:20 ` Christoph Hellwig
@ 2011-01-18 21:31 ` Nicholas A. Bellinger
0 siblings, 0 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-18 21:31 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-scsi
On Tue, 2011-01-18 at 22:20 +0100, Christoph Hellwig wrote:
> On Tue, Jan 18, 2011 at 12:59:16PM -0800, Nicholas A. Bellinger wrote:
> > On Tue, 2011-01-18 at 21:24 +0100, Christoph Hellwig wrote:
> > > Add the current directory is superflous in general, and no includes in
> > > drivers/scsi are needed either.
> > >
> > > Signed-off-by: Christoph Hellwig <hch@lst.de>
> > >
> >
> > Committed as c524eda into lio-core-2.6.git and picked into
> > scsi-post-merge-2.6.git/for-jejb.
>
> tcm_mod_builder.py should get a similar treatment, but I'm not python
> savy enough to not fuck that up.
> --
;)
Committed as 8ff3e08 into lio-core-2.6.git and picked into
scsi-post-merge-2.6.git/for-jejb.
Thanks!
--nab
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] target: do not include target_core_mib.h under include/target
2011-01-18 20:24 [PATCH] target: do not include target_core_mib.h under include/target Christoph Hellwig
2011-01-18 20:24 ` [PATCH] target: remove EXTRA_CFLAGS Christoph Hellwig
@ 2011-01-18 20:58 ` Nicholas A. Bellinger
1 sibling, 0 replies; 6+ messages in thread
From: Nicholas A. Bellinger @ 2011-01-18 20:58 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-scsi
On Tue, 2011-01-18 at 21:24 +0100, Christoph Hellwig wrote:
> Headers under include/ should not include headers that require a specific
> include path. Fix this by moving the defintion of scsi_port_stats to
> target_core_base.h, and including target_core_mib.h directly where needed.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Thanks Christoph.. Committed as 0080d7d into lio-core-2.6.git and
picked into scsi-post-merge-2.6.git/for-jejb.
--nab
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-18 21:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-18 20:24 [PATCH] target: do not include target_core_mib.h under include/target Christoph Hellwig
2011-01-18 20:24 ` [PATCH] target: remove EXTRA_CFLAGS Christoph Hellwig
2011-01-18 20:59 ` Nicholas A. Bellinger
2011-01-18 21:20 ` Christoph Hellwig
2011-01-18 21:31 ` Nicholas A. Bellinger
2011-01-18 20:58 ` [PATCH] target: do not include target_core_mib.h under include/target Nicholas A. Bellinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox