diff options
| author | Christoph Hellwig <hch@infradead.org> | 2011-06-01 07:56:57 +0400 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-22 13:37:44 +0400 |
| commit | 35462975b2b197b990fedbb74b81f9bea9d344cb (patch) | |
| tree | 72aea1508e81292f7fe7a17b39ed7f59de3dc3ce /include/target | |
| parent | db1620a2788f6c470804f6a5f983a0152188bd90 (diff) | |
| download | linux-35462975b2b197b990fedbb74b81f9bea9d344cb.tar.xz | |
target: merge release_cmd methods
The release_cmd_to_pool and release_cmd_direct methods are always the same.
Merge them into a single release_cmd method, and clean up the fallout.
(nab: fix breakage in transport_generic_free_cmd() parameter build breakage
in drivers/target/tcm_fc/tfc_cmd.c)
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'include/target')
| -rw-r--r-- | include/target/target_core_fabric_ops.h | 3 | ||||
| -rw-r--r-- | include/target/target_core_transport.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/target/target_core_fabric_ops.h b/include/target/target_core_fabric_ops.h index eba7201e5609..2de8fe907596 100644 --- a/include/target/target_core_fabric_ops.h +++ b/include/target/target_core_fabric_ops.h @@ -43,8 +43,7 @@ struct target_core_fabric_ops { * 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. */ diff --git a/include/target/target_core_transport.h b/include/target/target_core_transport.h index c9846d521945..604e669527b4 100644 --- a/include/target/target_core_transport.h +++ b/include/target/target_core_transport.h @@ -179,8 +179,8 @@ extern int transport_clear_lun_from_sessions(struct se_lun *); extern int transport_check_aborted_status(struct se_cmd *, int); extern int transport_send_check_condition_and_sense(struct se_cmd *, u8, int); extern void transport_send_task_abort(struct se_cmd *); -extern void transport_release_cmd_to_pool(struct se_cmd *); -extern void transport_generic_free_cmd(struct se_cmd *, int, int, int); +extern void transport_release_cmd(struct se_cmd *); +extern void transport_generic_free_cmd(struct se_cmd *, int, int); extern void transport_generic_wait_for_cmds(struct se_cmd *, int); extern int transport_init_task_sg(struct se_task *, struct se_mem *, u32); extern int transport_map_mem_to_sg(struct se_task *, struct list_head *, |