---

yaml --- r: 302418 b: refs/heads/master c: d28d96d h: refs/heads/master v: v3
git-mirror · May 11, 2012 · a276891 · a276891
1 parent 3d9e5ff
commit a276891
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11e764bd5ed4bb930e0ec5dd161df58307507347
+refs/heads/master: d28d96dcf635410422b41eca5203b0470dd059c1
diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c
@@ -1970,7 +1970,7 @@ static inline int transport_execute_task_attr(struct se_cmd *cmd)
  * Called from fabric module context in transport_generic_new_cmd() and
  * transport_generic_process_write()
  */
-static int transport_execute_tasks(struct se_cmd *cmd)
+static void transport_execute_tasks(struct se_cmd *cmd)
 {
 	int add_tasks;
 	struct se_device *se_dev = cmd->se_dev;
@@ -1984,16 +1984,12 @@ static int transport_execute_tasks(struct se_cmd *cmd)
 		 * attribute for the tasks of the received struct se_cmd CDB
 		 */
 		add_tasks = transport_execute_task_attr(cmd);
-		if (!add_tasks)
-			goto execute_tasks;
-
-		__transport_execute_tasks(se_dev, cmd);
-		return 0;
+		if (add_tasks) {
+			__transport_execute_tasks(se_dev, cmd);
+			return;
+		}
 	}
-
-execute_tasks:
 	__transport_execute_tasks(se_dev, NULL);
-	return 0;
 }
 
 static int __transport_execute_tasks(struct se_device *dev, struct se_cmd *new_cmd)