LU-6179 llite: remove LOCKAHEAD_OLD compatibility

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

diff --git a/lustre/include/lustre_export.h b/lustre/include/lustre_export.h
index 05a068d..f6e136a 100644 (file)
--- a/lustre/include/lustre_export.h
+++ b/lustre/include/lustre_export.h
@@ -42,6 +42,7 @@
  * @{
  */
 
+#include <linux/rhashtable.h>
 #include <linux/workqueue.h>
 
 #include <lprocfs_status.h>
@@ -211,7 +212,7 @@ struct obd_export {
        struct work_struct      exp_zombie_work;
        /* Unlinked export list */
        struct list_head        exp_stale_list;
-       struct hlist_node       exp_uuid_hash;  /** uuid-export hash*/
+       struct rhash_head       exp_uuid_hash;  /** uuid-export hash */
        struct hlist_node       exp_nid_hash;   /** nid-export hash */
        struct hlist_node       exp_gen_hash;   /** last_rcvd clt gen hash */
         /**
@@ -276,7 +277,9 @@ struct obd_export {
                                exp_need_mne_swab:1,
                                /* The export already got final replay ping
                                 * request. */
-                               exp_replay_done:1;
+                               exp_replay_done:1,
+                               /* local client with recovery disabled */
+                               exp_no_recovery:1;
        /* also protected by exp_lock */
        enum lustre_sec_part    exp_sp_peer;
        struct sptlrpc_flavor   exp_flvr;               /* current */
@@ -439,11 +442,6 @@ static inline int exp_connect_large_acl(struct obd_export *exp)
        return !!(exp_connect_flags(exp) & OBD_CONNECT_LARGE_ACL);
 }
 
-static inline int exp_connect_lockahead_old(struct obd_export *exp)
-{
-       return !!(exp_connect_flags(exp) & OBD_CONNECT_LOCKAHEAD_OLD);
-}
-
 static inline int exp_connect_lockahead(struct obd_export *exp)
 {
        return !!(exp_connect_flags2(exp) & OBD_CONNECT2_LOCKAHEAD);