target: Remove unnecessary se_task members

[pandora-kernel.git] / include / target / target_core_base.h

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 2704065..45291b2 100644 (file)
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -10,10 +10,7 @@
 #include <net/tcp.h>
 
 #define TARGET_CORE_MOD_VERSION                "v4.1.0-rc1-ml"
-#define SHUTDOWN_SIGS  (sigmask(SIGKILL)|sigmask(SIGINT)|sigmask(SIGABRT))
 
-/* Used by transport_generic_allocate_iovecs() */
-#define TRANSPORT_IOV_DATA_BUFFER              5
 /* Maximum Number of LUNs per Target Portal Group */
 /* Don't raise above 511 or REPORT_LUNS needs to handle >1 page */
 #define TRANSPORT_MAX_LUNS_PER_TPG             256
@@ -75,9 +72,13 @@ enum transport_tpg_type_table {
 };
 
 /* Used for generate timer flags */
-enum timer_flags_table {
-       TF_RUNNING      = 0x01,
-       TF_STOP         = 0x02,
+enum se_task_flags {
+       TF_ACTIVE               = (1 << 0),
+       TF_SENT                 = (1 << 1),
+       TF_TIMEOUT              = (1 << 2),
+       TF_REQUEST_STOP         = (1 << 3),
+       TF_TIMER_RUNNING        = (1 << 4),
+       TF_TIMER_STOP           = (1 << 5),
 };
 
 /* Special transport agnostic struct se_cmd->t_states */
@@ -408,24 +409,14 @@ struct se_task {
        u8              task_scsi_status;
        u8              task_flags;
        int             task_error_status;
-       int             task_state_flags;
-       bool            task_padded_sg;
        unsigned long long      task_lba;
-       u32             task_no;
        u32             task_sectors;
        u32             task_size;
        enum dma_data_direction task_data_direction;
        struct se_cmd *task_se_cmd;
-       struct se_device        *se_dev;
        struct completion       task_stop_comp;
-       atomic_t        task_active;
-       atomic_t        task_execute_queue;
-       atomic_t        task_timeout;
-       atomic_t        task_sent;
-       atomic_t        task_stop;
        atomic_t        task_state_active;
        struct timer_list       task_timer;
-       struct se_device *se_obj_ptr;
        struct list_head t_list;
        struct list_head t_execute_list;
        struct list_head t_state_list;
@@ -480,7 +471,6 @@ struct se_cmd {
        struct target_core_fabric_ops *se_tfo;
        int (*transport_emulate_cdb)(struct se_cmd *);
        void (*transport_split_cdb)(unsigned long long, u32, unsigned char *);
-       void (*transport_wait_for_tasks)(struct se_cmd *, int, int);
        void (*transport_complete_callback)(struct se_cmd *);
        int (*transport_qf_callback)(struct se_cmd *);