Attachment 314766 Details for Bug 459761 – fix nop timer checks

[patch] fix nop timer checks

fix-nop.patch (text/plain), 2.18 KB, created by Mike Christie on 2008-08-22 01:25:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Christie

Created: 2008-08-22 01:25:49 UTC

Size: 2.18 KB

patch

obsolete

>--- linux-2.6.18.noarch/drivers/scsi/libiscsi.c	2008-08-21 20:12:37.000000000 -0500
>+++ linux-2.6.18.noarch.nop/drivers/scsi/libiscsi.c	2008-08-21 20:19:27.000000000 -0500
>@@ -584,7 +584,9 @@ int __iscsi_complete_pdu(struct iscsi_co
> 				if (iscsi_recv_pdu(conn->cls_conn, hdr, data,
> 						   datalen))
> 					rc = ISCSI_ERR_CONN_FAILED;
>-			}
>+			} else
>+				mod_timer(&conn->transport_timer,
>+					  jiffies + conn->recv_timeout);
> 			iscsi_free_mgmt_task(conn, mtask);
> 			break;
> 		default:
>@@ -1306,19 +1308,20 @@ static void iscsi_check_transport_timeou
> {
> 	struct iscsi_conn *conn = (struct iscsi_conn *)data;	
> 	struct iscsi_session *session = conn->session;
>-	unsigned long timeout, next_timeout = 0, last_recv;
>+	unsigned long recv_timeout, next_timeout = 0, last_recv;
> 
> 	spin_lock(&session->lock);
> 	if (session->state != ISCSI_STATE_LOGGED_IN)
> 		goto done;
> 
>-	timeout = conn->recv_timeout;
>-	if (!timeout)
>+	recv_timeout = conn->recv_timeout;
>+	if (!recv_timeout)
> 		goto done;
> 
>-	timeout *= HZ;
>+	recv_timeout *= HZ;
> 	last_recv = conn->last_recv;
>-	if (time_before_eq(last_recv + timeout + (conn->ping_timeout * HZ),
>+	if (conn->ping_mtask &&
>+	    time_before_eq(conn->last_ping + (conn->ping_timeout * HZ),
> 			   jiffies)) {
> 		printk(KERN_ERR "ping timeout of %d secs expired, "
> 		       "last rx %lu, last ping %lu, now %lu\n",
>@@ -1329,15 +1332,13 @@ static void iscsi_check_transport_timeou
> 		return;
> 	}
> 
>-	if (time_before_eq(last_recv + timeout, jiffies)) {
>-		if (time_before_eq(conn->last_ping, last_recv)) {
>-			/* send a ping to try to provoke some traffic */
>-			debug_scsi("Sending nopout as ping on conn %p\n", conn);
>-			iscsi_send_nopout(conn, NULL);
>-		}
>-		next_timeout = last_recv + timeout + (conn->ping_timeout * HZ);
>+	if (time_before_eq(last_recv + recv_timeout, jiffies)) {
>+		/* send a ping to try to provoke some traffic */
>+		debug_scsi("Sending nopout as ping on conn %p\n", conn);
>+		iscsi_send_nopout(conn, NULL);
>+		next_timeout = conn->last_ping + (conn->ping_timeout * HZ);
> 	} else
>-		next_timeout = last_recv + timeout;
>+		next_timeout = last_recv + recv_timeout;
> 
> 	debug_scsi("Setting next tmo %lu\n", next_timeout);
> 	mod_timer(&conn->transport_timer, next_timeout);

Actions: View | Diff

Attachments on bug 459761: 314766