aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-10-12 11:06:56 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2011-10-23 23:21:03 -0400
commitc0427f155614908ca1147cd5b6a0d5cdcaef8327 (patch)
treea4c4d59078679302ccea165080213d0752b1369d /drivers/target
parent0a020436d8baf412bcf5997aee7796276ea773ae (diff)
target: Cleanup unused target_core_base.h bits
This is a squashed version of the following target_core_base.h cleanup patches: target: remove the unused SHUTDOWN_SIGS defintion target: remove unused se_mem leftovers target: remove the unused map_func_t typedef target: move TRANSPORT_IOV_DATA_BUFFER to the iscsi-specific code Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/iscsi/iscsi_target.c2
-rw-r--r--drivers/target/iscsi/iscsi_target_core.h3
-rw-r--r--drivers/target/target_core_transport.c3
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
index d86e18dc163..4d01768fcd9 100644
--- a/drivers/target/iscsi/iscsi_target.c
+++ b/drivers/target/iscsi/iscsi_target.c
@@ -765,7 +765,7 @@ static int iscsit_allocate_iovecs(struct iscsi_cmd *cmd)
765 u32 iov_count = (cmd->se_cmd.t_data_nents == 0) ? 1 : 765 u32 iov_count = (cmd->se_cmd.t_data_nents == 0) ? 1 :
766 cmd->se_cmd.t_data_nents; 766 cmd->se_cmd.t_data_nents;
767 767
768 iov_count += TRANSPORT_IOV_DATA_BUFFER; 768 iov_count += ISCSI_IOV_DATA_BUFFER;
769 769
770 cmd->iov_data = kzalloc(iov_count * sizeof(struct kvec), GFP_KERNEL); 770 cmd->iov_data = kzalloc(iov_count * sizeof(struct kvec), GFP_KERNEL);
771 if (!cmd->iov_data) { 771 if (!cmd->iov_data) {
diff --git a/drivers/target/iscsi/iscsi_target_core.h b/drivers/target/iscsi/iscsi_target_core.h
index 470ed551eeb..84818d7a705 100644
--- a/drivers/target/iscsi/iscsi_target_core.h
+++ b/drivers/target/iscsi/iscsi_target_core.h
@@ -57,6 +57,9 @@
57#define TA_PROD_MODE_WRITE_PROTECT 0 57#define TA_PROD_MODE_WRITE_PROTECT 0
58#define TA_CACHE_CORE_NPS 0 58#define TA_CACHE_CORE_NPS 0
59 59
60
61#define ISCSI_IOV_DATA_BUFFER 5
62
60enum tpg_np_network_transport_table { 63enum tpg_np_network_transport_table {
61 ISCSI_TCP = 0, 64 ISCSI_TCP = 0,
62 ISCSI_SCTP_TCP = 1, 65 ISCSI_SCTP_TCP = 1,
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index ee73f1095a1..89b85dd36cc 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -69,9 +69,6 @@ struct kmem_cache *t10_alua_lu_gp_mem_cache;
69struct kmem_cache *t10_alua_tg_pt_gp_cache; 69struct kmem_cache *t10_alua_tg_pt_gp_cache;
70struct kmem_cache *t10_alua_tg_pt_gp_mem_cache; 70struct kmem_cache *t10_alua_tg_pt_gp_mem_cache;
71 71
72/* Used for transport_dev_get_map_*() */
73typedef int (*map_func_t)(struct se_task *, u32);
74
75static int transport_generic_write_pending(struct se_cmd *); 72static int transport_generic_write_pending(struct se_cmd *);
76static int transport_processing_thread(void *param); 73static int transport_processing_thread(void *param);
77static int __transport_execute_tasks(struct se_device *dev); 74static int __transport_execute_tasks(struct se_device *dev);