diff options
-rw-r--r-- | drivers/target/loopback/tcm_loop.c | 2 | ||||
-rw-r--r-- | drivers/target/sbp/sbp_target.c | 3 | ||||
-rw-r--r-- | drivers/target/target_core_transport.c | 15 | ||||
-rw-r--r-- | drivers/usb/gadget/tcm_usb_gadget.c | 4 | ||||
-rw-r--r-- | include/target/target_core_fabric.h | 2 |
5 files changed, 8 insertions, 18 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 | ||
1863 | static void target_execute_cmd(struct se_cmd *cmd) | 1863 | void 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 | } |
1953 | EXPORT_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 | } |
2501 | EXPORT_SYMBOL(transport_generic_new_cmd); | 2502 | EXPORT_SYMBOL(transport_generic_new_cmd); |
2502 | 2503 | ||
2503 | /* transport_generic_process_write(): | ||
2504 | * | ||
2505 | * | ||
2506 | */ | ||
2507 | void transport_generic_process_write(struct se_cmd *cmd) | ||
2508 | { | ||
2509 | target_execute_cmd(cmd); | ||
2510 | } | ||
2511 | EXPORT_SYMBOL(transport_generic_process_write); | ||
2512 | |||
2513 | static void transport_write_pending_qf(struct se_cmd *cmd) | 2504 | static 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); |
diff --git a/drivers/usb/gadget/tcm_usb_gadget.c b/drivers/usb/gadget/tcm_usb_gadget.c index c46439c8dd74..031d44e86ec3 100644 --- a/drivers/usb/gadget/tcm_usb_gadget.c +++ b/drivers/usb/gadget/tcm_usb_gadget.c | |||
@@ -294,7 +294,7 @@ static int bot_send_write_request(struct usbg_cmd *cmd) | |||
294 | pr_err("%s(%d)\n", __func__, __LINE__); | 294 | pr_err("%s(%d)\n", __func__, __LINE__); |
295 | 295 | ||
296 | wait_for_completion(&cmd->write_complete); | 296 | wait_for_completion(&cmd->write_complete); |
297 | transport_generic_process_write(se_cmd); | 297 | target_execute_cmd(se_cmd); |
298 | cleanup: | 298 | cleanup: |
299 | return ret; | 299 | return ret; |
300 | } | 300 | } |
@@ -725,7 +725,7 @@ static int uasp_send_write_request(struct usbg_cmd *cmd) | |||
725 | } | 725 | } |
726 | 726 | ||
727 | wait_for_completion(&cmd->write_complete); | 727 | wait_for_completion(&cmd->write_complete); |
728 | transport_generic_process_write(se_cmd); | 728 | target_execute_cmd(se_cmd); |
729 | cleanup: | 729 | cleanup: |
730 | return ret; | 730 | return ret; |
731 | } | 731 | } |
diff --git a/include/target/target_core_fabric.h b/include/target/target_core_fabric.h index c78a23333c4f..59b4afb83ae1 100644 --- a/include/target/target_core_fabric.h +++ b/include/target/target_core_fabric.h | |||
@@ -121,7 +121,7 @@ int transport_generic_map_mem_to_cmd(struct se_cmd *cmd, | |||
121 | struct scatterlist *, u32, struct scatterlist *, u32); | 121 | struct scatterlist *, u32, struct scatterlist *, u32); |
122 | int transport_generic_new_cmd(struct se_cmd *); | 122 | int transport_generic_new_cmd(struct se_cmd *); |
123 | 123 | ||
124 | void transport_generic_process_write(struct se_cmd *); | 124 | void target_execute_cmd(struct se_cmd *cmd); |
125 | 125 | ||
126 | void transport_generic_free_cmd(struct se_cmd *, int); | 126 | void transport_generic_free_cmd(struct se_cmd *, int); |
127 | 127 | ||