From ec7c0621965e76f20bdeab1fb00ce5ef7afeeb0c Mon Sep 17 00:00:00 2001
From: green <green>
Date: Mon, 26 Apr 2004 17:03:34 +0000
Subject: [PATCH] Update to HEAD.

---
 lustre/.cvsignore                    | 15 +++++++++++++--
 lustre/include/linux/lustre_import.h | 10 +++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/lustre/.cvsignore b/lustre/.cvsignore
index f37e59b..07a5c92 100644
--- a/lustre/.cvsignore
+++ b/lustre/.cvsignore
@@ -4,9 +4,12 @@ aclocal.m4
 config.log
 config.status
 config.cache
+config.guess
+config.sub
 configure
 Makefile
-Makefile.in
+autoMakefile
+autoMakefile.in
 .deps
 tags
 TAGS
@@ -15,5 +18,13 @@ cscope.files
 cscope.out
 autom4te-2.53.cache
 autom4te.cache
-.*.o.cmd
+depcomp
+compile
+.*.cmd
 .mergeinfo-*
+Rules
+missing
+mkinstalldirs
+install-sh
+.depend
+.tmp_versions
diff --git a/lustre/include/linux/lustre_import.h b/lustre/include/linux/lustre_import.h
index c940ac1..d2af141 100644
--- a/lustre/include/linux/lustre_import.h
+++ b/lustre/include/linux/lustre_import.h
@@ -39,6 +39,12 @@ static inline char * ptlrpc_import_state_name(enum lustre_imp_state state)
         return import_state_names[state];
 }
 
+enum obd_import_event {
+        IMP_EVENT_DISCON     = 0x808001,
+        IMP_EVENT_INACTIVE   = 0x808002,
+        IMP_EVENT_INVALIDATE = 0x808003,
+        IMP_EVENT_ACTIVE     = 0x808004,
+};
 
 struct obd_import {
         struct portals_handle     imp_handle;
@@ -59,6 +65,7 @@ struct obd_import {
         struct obd_device        *imp_obd;
         wait_queue_head_t         imp_recovery_waitq;
         __u64                     imp_last_replay_transno;
+        atomic_t                  imp_inflight;
         atomic_t                  imp_replay_inflight;
         enum lustre_imp_state     imp_state;
         int                       imp_generation;
@@ -75,7 +82,8 @@ struct obd_import {
         /* flags */
         int                       imp_invalid:1, imp_replayable:1,
                                   imp_dlm_fake:1, imp_server_timeout:1,
-                                  imp_initial_recov:1;
+                                  imp_initial_recov:1, imp_force_verify:1,
+                                  imp_pingable:1;
         __u32                     imp_connect_op;
 };
 
-- 
1.8.3.1