Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / include / target / target_core_fabric.h

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 7fb2557a760e432ffa054f2550acd8e8a9e7085a..56653408f53bf6648c9f44175552e3dbb1436831 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -117,7 +117,7 @@ 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_get_session(struct se_session *);
 void   target_put_session(struct se_session *);
 ssize_t        target_show_dynamic_sessions(struct se_portal_group *, char *);
 void   transport_free_session(struct se_session *);
@@ -140,7 +140,7 @@ int target_submit_cmd(struct se_cmd *, struct se_session *, unsigned char *,
 int    target_submit_tmr(struct se_cmd *se_cmd, struct se_session *se_sess,
                unsigned char *sense, u64 unpacked_lun,
                void *fabric_tmr_ptr, unsigned char tm_type,
-               gfp_t, unsigned int, int);
+               gfp_t, u64, int);
 int    transport_handle_cdb_direct(struct se_cmd *);
 sense_reason_t transport_generic_new_cmd(struct se_cmd *);
 
@@ -169,10 +169,11 @@ void      core_allocate_nexus_loss_ua(struct se_node_acl *acl);
 
 struct se_node_acl *core_tpg_get_initiator_node_acl(struct se_portal_group *tpg,
                unsigned char *);
+bool   target_tpg_has_node_acl(struct se_portal_group *tpg,
+               const char *);
 struct se_node_acl *core_tpg_check_initiator_node_acl(struct se_portal_group *,
                unsigned char *);
-int    core_tpg_set_initiator_node_queue_depth(struct se_portal_group *,
-               unsigned char *, u32, int);
+int    core_tpg_set_initiator_node_queue_depth(struct se_node_acl *, u32);
 int    core_tpg_set_initiator_node_tag(struct se_portal_group *,
                struct se_node_acl *, const char *);
 int    core_tpg_register(struct se_wwn *, struct se_portal_group *, int);