Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[cascardo/linux.git] / include / target / target_core_fabric.h

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 8ff6d40..de44462 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -50,10 +50,6 @@ struct target_core_fabric_ops {
         */
        int (*check_stop_free)(struct se_cmd *);
        void (*release_cmd)(struct se_cmd *);
-       /*
-        * Called with spin_lock_bh(struct se_portal_group->session_lock held.
-        */
-       int (*shutdown_session)(struct se_session *);
        void (*close_session)(struct se_session *);
        u32 (*sess_get_index)(struct se_session *);
        /*
@@ -123,8 +119,6 @@ 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 *);
-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 *);
 void   target_put_nacl(struct se_node_acl *);
@@ -185,6 +179,10 @@ int        core_tpg_set_initiator_node_tag(struct se_portal_group *,
 int    core_tpg_register(struct se_wwn *, struct se_portal_group *, int);
 int    core_tpg_deregister(struct se_portal_group *);
 
+int    target_alloc_sgl(struct scatterlist **sgl, unsigned int *nents,
+               u32 length, bool zero_page, bool chainable);
+void   target_free_sgl(struct scatterlist *sgl, int nents);
+
 /*
  * The LIO target core uses DMA_TO_DEVICE to mean that data is going
  * to the target (eg handling a WRITE) and DMA_FROM_DEVICE to mean