branch: HEAD

[fs/lustre-release.git] / lustre / mdt / mdt_internal.h

diff --git a/lustre/mdt/mdt_internal.h b/lustre/mdt/mdt_internal.h
index 953ede9..ef19cc5 100644 (file)
--- a/lustre/mdt/mdt_internal.h
+++ b/lustre/mdt/mdt_internal.h
@@ -152,7 +152,8 @@ struct mdt_device {
         cfs_timer_t                mdt_ck_timer;
         struct ptlrpc_thread       mdt_ck_thread;
         struct lustre_capa_key     mdt_capa_keys[2];
-        unsigned int               mdt_capa_conf:1;
+        unsigned int               mdt_capa_conf:1,
+                                   mdt_som_conf:1;
 
         /* root squash */
         uid_t                      mdt_squash_uid;
@@ -175,9 +176,10 @@ struct mdt_device {
 #define mdt_client_bitmap_lock  mdt_lut.lut_client_bitmap_lock
 #define mdt_client_bitmap       mdt_lut.lut_client_bitmap
 
-#define MDT_SERVICE_WATCHDOG_FACTOR     (2000)
+#define MDT_SERVICE_WATCHDOG_FACTOR     (2)
 #define MDT_ROCOMPAT_SUPP       (OBD_ROCOMPAT_LOVOBJID)
-#define MDT_INCOMPAT_SUPP       (OBD_INCOMPAT_MDT | OBD_INCOMPAT_COMMON_LR)
+#define MDT_INCOMPAT_SUPP       (OBD_INCOMPAT_MDT | OBD_INCOMPAT_COMMON_LR | \
+                                 OBD_INCOMPAT_FID | OBD_INCOMPAT_IAM_DIR)
 #define MDT_COS_DEFAULT         (1)
 
 struct mdt_object {