LU-7934 osp: fix tr->otr_next_id overflow

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

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 76bd434..a6a83d9 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -183,8 +183,8 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_MDS_CONNECT_PACK        0x118
 #define OBD_FAIL_MDS_REINT_NET_REP       0x119
 #define OBD_FAIL_MDS_DISCONNECT_NET      0x11a
-#define OBD_FAIL_MDS_GETSTATUS_NET       0x11b
-#define OBD_FAIL_MDS_GETSTATUS_PACK      0x11c
+#define OBD_FAIL_MDS_GET_ROOT_NET       0x11b
+#define OBD_FAIL_MDS_GET_ROOT_PACK      0x11c
 #define OBD_FAIL_MDS_STATFS_PACK         0x11d
 #define OBD_FAIL_MDS_STATFS_NET          0x11e
 #define OBD_FAIL_MDS_GETATTR_NAME_NET    0x11f
@@ -250,6 +250,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_MDS_LLOG_CREATE_FAILED2 0x15b
 #define OBD_FAIL_MDS_FLD_LOOKUP                        0x15c
 #define OBD_FAIL_MDS_INTENT_DELAY              0x160
+#define OBD_FAIL_MDS_TRACK_OVERFLOW     0x162
 
 /* layout lock */
 #define OBD_FAIL_MDS_NO_LL_GETATTR      0x170
@@ -323,6 +324,8 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_SET_INFO_NET        0x232
 #define OBD_FAIL_OST_NODESTROY          0x233
 #define OBD_FAIL_OST_READ_SIZE          0x234
+#define OBD_FAIL_OST_LADVISE_NET        0x235
+#define OBD_FAIL_OST_PAUSE_PUNCH         0x236
 
 #define OBD_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
@@ -465,6 +468,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_MGS_TARGET_DEL_NET     0x90b
 #define OBD_FAIL_MGS_CONFIG_READ_NET    0x90c
 #define OBD_FAIL_MGS_LDLM_REPLY_NET     0x90d
+#define OBD_FAIL_MGS_WRITE_TARGET_DELAY         0x90e
 
 #define OBD_FAIL_QUOTA_DQACQ_NET                       0xA01
 #define OBD_FAIL_QUOTA_EDQUOT            0xA02
@@ -612,6 +616,7 @@ extern char obd_jobid_var[];
 
 #define OBD_FAIL_OSP_CHECK_INVALID_REC         0x2100
 #define OBD_FAIL_OSP_CHECK_ENOMEM              0x2101
+#define OBD_FAIL_OSP_FAKE_PRECREATE            0x2102
 
 /* Assign references to moved code to reduce code changes */
 #define OBD_FAIL_PRECHECK(id)                   CFS_FAIL_PRECHECK(id)
@@ -745,7 +750,11 @@ do {                                                                             \
 
 #define OBD_ALLOC_LARGE(ptr, size)                                            \
 do {                                                                          \
-       OBD_ALLOC_GFP(ptr, size, GFP_NOFS | __GFP_NOWARN);                    \
+       /* LU-8196 - force large allocations to use vmalloc, not kmalloc */   \
+       if ((size) > KMALLOC_MAX_SIZE)                                          \
+               ptr = NULL;                                                   \
+       else                                                                  \
+               OBD_ALLOC_GFP(ptr, size, GFP_NOFS | __GFP_NOWARN);            \
        if (ptr == NULL)                                                      \
                 OBD_VMALLOC(ptr, size);                                       \
 } while (0)