CIFS: Fix possible wrong memory allocation

[firefly-linux-kernel-4.4.55.git] / include / target / target_core_fabric.h

diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h
index 10c6908096011fdc2c73628d707bed69b561afde..116959933f46442b27075ba7d40c79c746308049 100644 (file)
--- a/include/target/target_core_fabric.h
+++ b/include/target/target_core_fabric.h
@@ -3,12 +3,6 @@
 
 struct target_core_fabric_ops {
        struct configfs_subsystem *tf_subsys;
-       /*
-        * Optional to signal struct se_task->task_sg[] padding entries
-        * for scatterlist chaining using transport_do_task_sg_link(),
-        * disabled by default
-        */
-       bool task_sg_chaining;
        char *(*get_fabric_name)(void);
        u8 (*get_fabric_proto_ident)(struct se_portal_group *);
        char *(*tpg_get_wwn)(struct se_portal_group *);
@@ -102,7 +96,7 @@ void __transport_register_session(struct se_portal_group *,
 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   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 *);
@@ -112,7 +106,7 @@ void        transport_deregister_session(struct se_session *);
 void   transport_init_se_cmd(struct se_cmd *, struct target_core_fabric_ops *,
                struct se_session *, u32, int, int, unsigned char *);
 int    transport_lookup_cmd_lun(struct se_cmd *, u32);
-int    transport_generic_allocate_tasks(struct se_cmd *, unsigned char *);
+int    target_setup_cmd_from_cdb(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,
@@ -124,7 +118,6 @@ int transport_generic_handle_cdb_map(struct se_cmd *);
 int    transport_generic_handle_data(struct se_cmd *);
 int    transport_generic_map_mem_to_cmd(struct se_cmd *cmd,
                struct scatterlist *, u32, struct scatterlist *, u32);
-void   transport_do_task_sg_chain(struct se_cmd *);
 int    transport_generic_new_cmd(struct se_cmd *);
 
 void   transport_generic_process_write(struct se_cmd *);