aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2006-10-16 18:09:40 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-10-25 18:13:57 -0400
commitcd529a46e17b43976d05c1e2ece2676ec7941cc8 (patch)
treeb52d86911134d1d35f44d12171950c9aab07c887
parent98644047916c24258fb47c3dab2bed8a44f53b83 (diff)
[SCSI] libiscsi: fix missed iscsi_task_put in xmit error path
from bhalevy@gmail.com: It looks like change 652 to libiscsi.c added some dead code around line 670 if (rc) { spin_unlock_bh(&conn->session->lock); goto again; } since 5 lines above we goto again if (rc). It looks like the previous if (rc) should go away if we want to put the ctask before breaking out of the while loop with "goto again" (see following patch). Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/libiscsi.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 1000fe936791..e3a2ec253cf1 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -661,8 +661,6 @@ static int iscsi_data_xmit(struct iscsi_conn *conn)
661 spin_unlock_bh(&conn->session->lock); 661 spin_unlock_bh(&conn->session->lock);
662 662
663 rc = tt->xmit_cmd_task(conn, conn->ctask); 663 rc = tt->xmit_cmd_task(conn, conn->ctask);
664 if (rc)
665 goto again;
666 664
667 spin_lock_bh(&conn->session->lock); 665 spin_lock_bh(&conn->session->lock);
668 __iscsi_put_ctask(conn->ctask); 666 __iscsi_put_ctask(conn->ctask);