Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / include / target / target_core_fabric_ops.h

diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h
index 747e1404dca0db5c43041e6521eb4ba95ee5ed14..2de8fe9075963350f8159759c118dedc70db1b57 100644 (file)
--- a/include/target/target_core_fabric_ops.h
+++ b/include/target/target_core_fabric_ops.h
@@ -38,18 +38,12 @@ struct target_core_fabric_ops {
         * initially allocated in interrupt context.
         */
        int (*new_cmd_map)(struct se_cmd *);
-       /*
-        * Optional function pointer for TCM fabric modules that use
-        * Linux/NET sockets to allocate struct iovec array to struct se_cmd
-        */
-       int (*alloc_cmd_iovecs)(struct se_cmd *);
        /*
         * Optional to release struct se_cmd and fabric dependent allocated
         * I/O descriptor in transport_cmd_check_stop()
         */
        void (*check_stop_free)(struct se_cmd *);
-       void (*release_cmd_to_pool)(struct se_cmd *);
-       void (*release_cmd_direct)(struct se_cmd *);
+       void (*release_cmd)(struct se_cmd *);
        /*
         * Called with spin_lock_bh(struct se_portal_group->session_lock held.
         */
@@ -70,7 +64,6 @@ struct target_core_fabric_ops {
        void (*set_default_node_attributes)(struct se_node_acl *);
        u32 (*get_task_tag)(struct se_cmd *);
        int (*get_cmd_state)(struct se_cmd *);
-       void (*new_cmd_failure)(struct se_cmd *);
        int (*queue_data_in)(struct se_cmd *);
        int (*queue_status)(struct se_cmd *);
        int (*queue_tm_rsp)(struct se_cmd *);