From 8a8c12b9c3cdc2bf84b8c4d2c50ff7e924357150 Mon Sep 17 00:00:00 2001 From: eeb Date: Sun, 16 Nov 2003 17:45:55 +0000 Subject: [PATCH] * Plugged a spurious timeout hole --- lnet/klnds/socklnd/socklnd_cb.c | 5 +++++ lustre/portals/knals/socknal/socknal_cb.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index 6cd4e73..fd179f8 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -891,6 +891,11 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) spin_lock_irqsave (&sched->kss_lock, flags); + conn->ksnc_tx_deadline = jiffies + + ksocknal_data.ksnd_io_timeout * HZ; + mb(); + /* Extend deadline BEFORE tx is enqueued */ + list_add_tail (&tx->tx_list, &conn->ksnc_tx_queue); if (conn->ksnc_tx_ready && /* able to send */ diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c index 6cd4e73..fd179f8 100644 --- a/lustre/portals/knals/socknal/socknal_cb.c +++ b/lustre/portals/knals/socknal/socknal_cb.c @@ -891,6 +891,11 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t *conn) spin_lock_irqsave (&sched->kss_lock, flags); + conn->ksnc_tx_deadline = jiffies + + ksocknal_data.ksnd_io_timeout * HZ; + mb(); + /* Extend deadline BEFORE tx is enqueued */ + list_add_tail (&tx->tx_list, &conn->ksnc_tx_queue); if (conn->ksnc_tx_ready && /* able to send */ -- 1.8.3.1