浏览代码

[SCSI] libiscsi: don't call into lld to cleanup task

In the normal IO path we should not be calling back
into the LLD since the LLD will have cleaned up the
task before or after calling complete pdu.

For the fail_command path we still need to do this
to force the cleanup.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Mike Christie 18 年之前
父节点
当前提交
e648f63c65
共有 1 个文件被更改,包括 4 次插入5 次删除
  1. 4 5
      drivers/scsi/libiscsi.c

+ 4 - 5
drivers/scsi/libiscsi.c

@@ -213,12 +213,8 @@ static void iscsi_get_ctask(struct iscsi_cmd_task *ctask)
 
 
 static void __iscsi_put_ctask(struct iscsi_cmd_task *ctask)
 static void __iscsi_put_ctask(struct iscsi_cmd_task *ctask)
 {
 {
-	struct iscsi_conn *conn = ctask->conn;
-
-	if (atomic_dec_and_test(&ctask->refcount)) {
-		conn->session->tt->cleanup_cmd_task(conn, ctask);
+	if (atomic_dec_and_test(&ctask->refcount))
 		iscsi_complete_command(ctask);
 		iscsi_complete_command(ctask);
-	}
 }
 }
 
 
 static void iscsi_put_ctask(struct iscsi_cmd_task *ctask)
 static void iscsi_put_ctask(struct iscsi_cmd_task *ctask)
@@ -1129,10 +1125,13 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_cmd_task *ctask,
 	sc = ctask->sc;
 	sc = ctask->sc;
 	if (!sc)
 	if (!sc)
 		return;
 		return;
+
+	conn->session->tt->cleanup_cmd_task(conn, ctask);
 	iscsi_ctask_mtask_cleanup(ctask);
 	iscsi_ctask_mtask_cleanup(ctask);
 
 
 	sc->result = err;
 	sc->result = err;
 	sc->resid = sc->request_bufflen;
 	sc->resid = sc->request_bufflen;
+	/* release ref from queuecommand */
 	__iscsi_put_ctask(ctask);
 	__iscsi_put_ctask(ctask);
 }
 }