Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / include / target / target_core_fabric.h

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index d36fad317e78089ea95e13a9b414558379f6326d..10c6908096011fdc2c73628d707bed69b561afde 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -58,9 +58,6 @@ struct target_core_fabric_ops {
         */
        int (*shutdown_session)(struct se_session *);
        void (*close_session)(struct se_session *);
-       void (*stop_session)(struct se_session *, int, int);
-       void (*fall_back_to_erl0)(struct se_session *);
-       int (*sess_logged_in)(struct se_session *);
        u32 (*sess_get_index)(struct se_session *);
        /*
         * Used only for SCSI fabrics that contain multi-value TransportIDs
@@ -78,7 +75,6 @@ struct target_core_fabric_ops {
        int (*queue_tm_rsp)(struct se_cmd *);
        u16 (*set_fabric_sense_len)(struct se_cmd *, u32);
        u16 (*get_fabric_sense_len)(void);
-       int (*is_state_remove)(struct se_cmd *);
        /*
         * fabric module calls for target_core_fabric_configfs.c
         */
@@ -105,7 +101,10 @@ void       __transport_register_session(struct se_portal_group *,
                struct se_node_acl *, struct se_session *, void *);
 void   transport_register_session(struct se_portal_group *,
                struct se_node_acl *, struct se_session *, void *);
+void   target_get_session(struct se_session *);
+int    target_put_session(struct se_session *);
 void   transport_free_session(struct se_session *);
+void   target_put_nacl(struct se_node_acl *);
 void   transport_deregister_session_configfs(struct se_session *);
 void   transport_deregister_session(struct se_session *);
 
@@ -116,6 +115,10 @@ int        transport_lookup_cmd_lun(struct se_cmd *, u32);
 int    transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
 void   target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
                unsigned char *, u32, u32, int, int, int);
+int    target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,
+               unsigned char *sense, u32 unpacked_lun,
+               void *fabric_tmr_ptr, unsigned char tm_type,
+               gfp_t, unsigned int, int);
 int    transport_handle_cdb_direct(struct se_cmd *);
 int    transport_generic_handle_cdb_map(struct se_cmd *);
 int    transport_generic_handle_data(struct se_cmd *);
@@ -139,9 +142,10 @@ void       target_wait_for_sess_cmds(struct se_session *, int);
 
 int    core_alua_check_nonop_delay(struct se_cmd *);
 
-struct se_tmr_req *core_tmr_alloc_req(struct se_cmd *, void *, u8, gfp_t);
+int    core_tmr_alloc_req(struct se_cmd *, void *, u8, gfp_t);
 void   core_tmr_release_req(struct se_tmr_req *);
 int    transport_generic_handle_tmr(struct se_cmd *);
+void   transport_generic_request_failure(struct se_cmd *);
 int    transport_lookup_tmr_lun(struct se_cmd *, u32);
 
 struct se_node_acl *core_tpg_check_initiator_node_acl(struct se_portal_group *,