Merge b_md into HEAD

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

diff --git a/lustre/include/linux/lustre_import.h b/lustre/include/linux/lustre_import.h
index 0f0d67d..36cd54f 100644 (file)
--- a/lustre/include/linux/lustre_import.h
+++ b/lustre/include/linux/lustre_import.h
@@ -18,6 +18,7 @@
 typedef int (*import_recover_t)(struct obd_import *imp, int phase);
 
 #include <linux/lustre_idl.h>
+
 struct obd_import {
         import_recover_t          imp_recover;
         struct ptlrpc_connection *imp_connection;
@@ -36,11 +37,11 @@ struct obd_import {
         int                       imp_flags;
         int                       imp_level;
         __u64                     imp_last_xid;
+        __u64                     imp_last_bulk_xid;
         __u64                     imp_max_transno;
-        __u64                     imp_peer_last_xid;
         __u64                     imp_peer_committed_transno;
 
-        /* Protects flags, level, *_xid, *_list */
+        /* Protects flags, level, last_xid, *_list */
         spinlock_t                imp_lock;
 };