From 2ff0714754efd079bd9bb980a4efb976683e3cc8 Mon Sep 17 00:00:00 2001 From: scjody Date: Tue, 27 Jun 2006 18:12:56 +0000 Subject: [PATCH] Branch b1_5 b=9387 r=adilger Minor tweaks as part of the fix to 9387. --- lustre/include/lustre_import.h | 4 ++-- lustre/ptlrpc/import.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h index e011e5b..0639d79 100644 --- a/lustre/include/lustre_import.h +++ b/lustre/include/lustre_import.h @@ -45,7 +45,7 @@ struct obd_import_conn { struct list_head oic_item; struct ptlrpc_connection *oic_conn; struct obd_uuid oic_uuid; - __u64 oic_last_attempt; /* in cfs_time_t */ + __u64 oic_last_attempt; /* jiffies, 64-bit */ }; struct obd_import { @@ -77,7 +77,7 @@ struct obd_import { __u64 imp_last_transno_checked; struct lustre_handle imp_remote_handle; cfs_time_t imp_next_ping; /* jiffies */ - __u64 imp_last_success_conn; /* jiffies */ + __u64 imp_last_success_conn; /* jiffies, 64-bit */ /* all available obd_import_conn linked here */ struct list_head imp_conn_list; diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c index 00e23ea..55fb8f9 100644 --- a/lustre/ptlrpc/import.c +++ b/lustre/ptlrpc/import.c @@ -276,7 +276,8 @@ static int import_select_connection(struct obd_import *imp) conn->oic_last_attempt); /* Throttle the reconnect rate to once per RECONNECT_INTERVAL */ - if (jiffies > conn->oic_last_attempt + RECONNECT_INTERVAL * HZ) { + if (get_jiffies_64() > + conn->oic_last_attempt + RECONNECT_INTERVAL * HZ) { /* If we have never tried this connection since the the last successful attempt, go with this one */ -- 1.8.3.1