aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/target
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2012-07-08 15:58:39 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2012-07-16 20:35:16 -0400
commit70baf0ab3b2608727515086bee4c484a93e22880 (patch)
tree9cb6a054b5b83c44629e3e1408839b570a228658 /drivers/target
parentf7113a47e2c3880ed5f8a05ff9c54ead4ee7351c (diff)
target: remove transport_generic_process_write
Just call target_execute_cmd directly. Also, convert loopback, sbp, usb-gadget to use the newly exported target_execute_cmd(). Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/target')
-rw-r--r--drivers/target/loopback/tcm_loop.c2
-rw-r--r--drivers/target/sbp/sbp_target.c3
-rw-r--r--drivers/target/target_core_transport.c15
3 files changed, 5 insertions, 15 deletions
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index f65dc9db8596..5491c632a15e 100644
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -778,7 +778,7 @@ static int tcm_loop_write_pending(struct se_cmd *se_cmd)
778 * We now tell TCM to add this WRITE CDB directly into the TCM storage 778 * We now tell TCM to add this WRITE CDB directly into the TCM storage
779 * object execution queue. 779 * object execution queue.
780 */ 780 */
781 transport_generic_process_write(se_cmd); 781 target_execute_cmd(se_cmd);
782 return 0; 782 return 0;
783} 783}
784 784
diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
index 7e6136e2ce81..0848c4ca2a32 100644
--- a/drivers/target/sbp/sbp_target.c
+++ b/drivers/target/sbp/sbp_target.c
@@ -1784,8 +1784,7 @@ static int sbp_write_pending(struct se_cmd *se_cmd)
1784 return ret; 1784 return ret;
1785 } 1785 }
1786 1786
1787 transport_generic_process_write(se_cmd); 1787 target_execute_cmd(se_cmd);
1788
1789 return 0; 1788 return 0;
1790} 1789}
1791 1790
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 3f20fbd88cd4..aeb2d576dc00 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1860,7 +1860,7 @@ static void __target_execute_cmd(struct se_cmd *cmd)
1860 } 1860 }
1861} 1861}
1862 1862
1863static void target_execute_cmd(struct se_cmd *cmd) 1863void target_execute_cmd(struct se_cmd *cmd)
1864{ 1864{
1865 struct se_device *dev = cmd->se_dev; 1865 struct se_device *dev = cmd->se_dev;
1866 1866
@@ -1950,6 +1950,7 @@ execute:
1950 */ 1950 */
1951 __target_execute_cmd(cmd); 1951 __target_execute_cmd(cmd);
1952} 1952}
1953EXPORT_SYMBOL(target_execute_cmd);
1953 1954
1954/* 1955/*
1955 * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd 1956 * Used to obtain Sense Data from underlying Linux/SCSI struct scsi_cmnd
@@ -2500,16 +2501,6 @@ out_fail:
2500} 2501}
2501EXPORT_SYMBOL(transport_generic_new_cmd); 2502EXPORT_SYMBOL(transport_generic_new_cmd);
2502 2503
2503/* transport_generic_process_write():
2504 *
2505 *
2506 */
2507void transport_generic_process_write(struct se_cmd *cmd)
2508{
2509 target_execute_cmd(cmd);
2510}
2511EXPORT_SYMBOL(transport_generic_process_write);
2512
2513static void transport_write_pending_qf(struct se_cmd *cmd) 2504static void transport_write_pending_qf(struct se_cmd *cmd)
2514{ 2505{
2515 int ret; 2506 int ret;
@@ -3321,7 +3312,7 @@ get_cmd:
3321 } 3312 }
3322 break; 3313 break;
3323 case TRANSPORT_PROCESS_WRITE: 3314 case TRANSPORT_PROCESS_WRITE:
3324 transport_generic_process_write(cmd); 3315 target_execute_cmd(cmd);
3325 break; 3316 break;
3326 case TRANSPORT_PROCESS_TMR: 3317 case TRANSPORT_PROCESS_TMR:
3327 transport_generic_do_tmr(cmd); 3318 transport_generic_do_tmr(cmd);