X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=52960d8ec73372a159fe3def6b7b22a4797c0636;hp=69477d88e955b12d2457a1e0b4e029b1a7f52e94;hb=1d97a8b4cd3de9074f323332c7b736367a70d419;hpb=580ef453d1d6f901c3227a037137a7db9e600009;ds=sidebyside

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 69477d8..52960d8 100644
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -80,9 +80,6 @@ extern char obd_jobid_var[];
 #define HASH_LQE_BKT_BITS 5
 #define HASH_LQE_CUR_BITS 7
 #define HASH_LQE_MAX_BITS 12
-#define HASH_CONN_BKT_BITS 5
-#define HASH_CONN_CUR_BITS 5
-#define HASH_CONN_MAX_BITS 15
 #define HASH_EXP_LOCK_BKT_BITS  5
 #define HASH_EXP_LOCK_CUR_BITS  7
 #define HASH_EXP_LOCK_MAX_BITS  16
@@ -343,6 +340,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_PREPARE_DELAY	 0x247
 #define OBD_FAIL_OST_2BIG_NIOBUF	 0x248
 #define OBD_FAIL_OST_FALLOCATE_NET	 0x249
+#define OBD_FAIL_OST_WR_ATTR_DELAY	 0x250
 
 #define OBD_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
@@ -560,6 +558,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_LLOG_PURGE_DELAY		    0x1318
 #define OBD_FAIL_PLAIN_RECORDS			    0x1319
 #define OBD_FAIL_CATALOG_FULL_CHECK		    0x131a
+#define OBD_FAIL_CATLIST			    0x131b
 
 #define OBD_FAIL_LLITE                              0x1400
 #define OBD_FAIL_LLITE_FAULT_TRUNC_RACE             0x1401
@@ -1009,4 +1008,9 @@ struct obd_heat_instance {
 	__u64 ohi_count;
 };
 
+/* Define a fixed 4096-byte encryption unit size */
+#define LUSTRE_ENCRYPTION_BLOCKBITS   12
+#define LUSTRE_ENCRYPTION_UNIT_SIZE   ((size_t)1 << LUSTRE_ENCRYPTION_BLOCKBITS)
+#define LUSTRE_ENCRYPTION_MASK        (~(LUSTRE_ENCRYPTION_UNIT_SIZE - 1))
+
 #endif