aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJörn Engel <joern@logfs.org>2012-05-11 10:33:41 -0400
committerNicholas Bellinger <nab@linux-iscsi.org>2012-05-11 18:01:48 -0400
commitd28d96dcf635410422b41eca5203b0470dd059c1 (patch)
tree1be69678d962cfaa08d8fafdaaa34c2f2b9ed157
parent11e764bd5ed4bb930e0ec5dd161df58307507347 (diff)
target: cleanup transport_execute_tasks()
The function is effectively void and doesn't need any goto logic. Signed-off-by: Joern Engel <joern@logfs.org> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
-rw-r--r--drivers/target/target_core_transport.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 59577568f935..397e8bd4d596 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -1970,7 +1970,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
1970 * Called from fabric module context in transport_generic_new_cmd() and 1970 * Called from fabric module context in transport_generic_new_cmd() and
1971 * transport_generic_process_write() 1971 * transport_generic_process_write()
1972 */ 1972 */
1973static int transport_execute_tasks(struct se_cmd *cmd) 1973static void transport_execute_tasks(struct se_cmd *cmd)
1974{ 1974{
1975 int add_tasks; 1975 int add_tasks;
1976 struct se_device *se_dev = cmd->se_dev; 1976 struct se_device *se_dev = cmd->se_dev;
@@ -1984,16 +1984,12 @@ static int transport_execute_tasks(struct se_cmd *cmd)
1984 * attribute for the tasks of the received struct se_cmd CDB 1984 * attribute for the tasks of the received struct se_cmd CDB
1985 */ 1985 */
1986 add_tasks = transport_execute_task_attr(cmd); 1986 add_tasks = transport_execute_task_attr(cmd);
1987 if (!add_tasks) 1987 if (add_tasks) {
1988 goto execute_tasks; 1988 __transport_execute_tasks(se_dev, cmd);
1989 1989 return;
1990 __transport_execute_tasks(se_dev, cmd); 1990 }
1991 return 0;
1992 } 1991 }
1993
1994execute_tasks:
1995 __transport_execute_tasks(se_dev, NULL); 1992 __transport_execute_tasks(se_dev, NULL);
1996 return 0;
1997} 1993}
1998 1994
1999static int __transport_execute_tasks(struct se_device *dev, struct se_cmd *new_cmd) 1995static int __transport_execute_tasks(struct se_device *dev, struct se_cmd *new_cmd)