Branch HEAD

[fs/lustre-release.git] / lustre / include / lustre_import.h

diff --git a/lustre/include/lustre_import.h b/lustre/include/lustre_import.h
index b9dcf85..7a5c761 100644 (file)
--- a/lustre/include/lustre_import.h
+++ b/lustre/include/lustre_import.h
@@ -66,10 +66,13 @@ struct obd_import {
 
         struct obd_device        *imp_obd;
         struct ptlrpc_sec        *imp_sec;
+        struct semaphore          imp_sec_mutex;
+        cfs_time_t                imp_sec_expire;
         cfs_waitq_t               imp_recovery_waitq;
 
         atomic_t                  imp_inflight;
         atomic_t                  imp_replay_inflight;
+        atomic_t                  imp_inval_count;
         enum lustre_imp_state     imp_state;
         int                       imp_generation;
         __u32                     imp_conn_cnt;
@@ -80,7 +83,6 @@ struct obd_import {
         struct lustre_handle      imp_remote_handle;
         cfs_time_t                imp_next_ping;   /* jiffies */
         __u64                     imp_last_success_conn;   /* jiffies, 64-bit */
-        cfs_time_t                imp_next_reconnect;      /* seconds */
 
         /* all available obd_import_conn linked here */
         struct list_head          imp_conn_list;
@@ -90,7 +92,7 @@ struct obd_import {
         spinlock_t                imp_lock;
 
         /* flags */
-        unsigned int              imp_no_timeout:1,       /* timeouts are disabled */
+        unsigned long             imp_no_timeout:1,       /* timeouts are disabled */
                                   imp_invalid:1,          /* evicted */
                                   imp_deactive:1,         /* administratively disabled */
                                   imp_replayable:1,       /* try to recover the import */