Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ad294e9cd11d029fc0d09ab129fba5bea46de0dc
Commit:     ad294e9cd11d029fc0d09ab129fba5bea46de0dc
Parent:     921601b7031f8a2c71f49f1b965ee00ebbca6886
Author:     Mike Christie <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 31 13:36:50 2008 -0600
Committer:  James Bottomley <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 18:02:37 2008 -0600

    [SCSI] libiscsi: fix setting of nop timer
    
    If we rollover then we could get a next_timeout of zero, so we need
    to set the new timer to that value.
    
    Signed-off-by: Mike Christie <[EMAIL PROTECTED]>
    Signed-off-by: James Bottomley <[EMAIL PROTECTED]>
---
 drivers/scsi/libiscsi.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index c8c00e1..b2a1ec8 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1384,14 +1384,11 @@ static void iscsi_check_transport_timeouts(unsigned 
long data)
                        iscsi_send_nopout(conn, NULL);
                }
                next_timeout = last_recv + timeout + (conn->ping_timeout * HZ);
-       } else {
+       } else
                next_timeout = last_recv + timeout;
-       }
 
-       if (next_timeout) {
-               debug_scsi("Setting next tmo %lu\n", next_timeout);
-               mod_timer(&conn->transport_timer, next_timeout);
-       }
+       debug_scsi("Setting next tmo %lu\n", next_timeout);
+       mod_timer(&conn->transport_timer, next_timeout);
 done:
        spin_unlock(&session->lock);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to