Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[deliverable/linux.git] / include / target / target_core_base.h

diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
index 3e0dd86360a24bd45889d57c6609ba40ac2681f9..fb8e3b6febdff7f5fdb3f0335455b9e074647c40 100644 (file)
--- a/include/target/target_core_base.h
+++ b/include/target/target_core_base.h
@@ -142,6 +142,7 @@ enum se_cmd_flags_table {
        SCF_PASSTHROUGH_PROT_SG_TO_MEM_NOALLOC = 0x00200000,
        SCF_ACK_KREF                    = 0x00400000,
        SCF_USE_CPUID                   = 0x00800000,
+       SCF_TASK_ATTR_SET               = 0x01000000,
 };
 
 /*
@@ -536,7 +537,6 @@ struct se_node_acl {
        char                    initiatorname[TRANSPORT_IQN_LEN];
        /* Used to signal demo mode created ACL, disabled by default */
        bool                    dynamic_node_acl;
-       bool                    acl_stop:1;
        u32                     queue_depth;
        u32                     acl_index;
        enum target_prot_type   saved_prot_type;
@@ -603,7 +603,6 @@ struct se_session {
        struct list_head        sess_cmd_list;
        struct list_head        sess_wait_list;
        spinlock_t              sess_cmd_lock;
-       struct kref             sess_kref;
        void                    *sess_cmd_map;
        struct percpu_ida       sess_tag_pool;
 };