LU-7422 mdt: fix ENOENT handling in mdt_intent_reint

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

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index a537840..439c409 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -248,6 +248,8 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_MDS_REINT_MULTI_NET     0x159
 #define OBD_FAIL_MDS_REINT_MULTI_NET_REP 0x15a
 #define OBD_FAIL_MDS_LLOG_CREATE_FAILED2 0x15b
+#define OBD_FAIL_MDS_FLD_LOOKUP                        0x15c
+#define OBD_FAIL_MDS_INTENT_DELAY              0x160
 
 /* layout lock */
 #define OBD_FAIL_MDS_NO_LL_GETATTR      0x170
@@ -297,7 +299,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_OST_BRW_PAUSE_BULK      0x214
 #define OBD_FAIL_OST_ENOSPC              0x215
 #define OBD_FAIL_OST_EROFS               0x216
-#define OBD_FAIL_OST_ENOENT              0x217
+#define OBD_FAIL_SRV_ENOENT              0x217
 /*     OBD_FAIL_OST_QUOTACHECK_NET      0x218 obsolete since 2.4 */
 #define OBD_FAIL_OST_QUOTACTL_NET        0x219
 #define OBD_FAIL_OST_CHECKSUM_RECEIVE    0x21a
@@ -438,6 +440,7 @@ extern char obd_jobid_var[];
 #define OBD_FAIL_TGT_DELAY_CONDITIONAL  0x713
 #define OBD_FAIL_TGT_REPLAY_DELAY2       0x714
 #define OBD_FAIL_TGT_REPLAY_RECONNECT   0x715
+#define OBD_FAIL_TGT_MOUNT_RACE                 0x716
 
 #define OBD_FAIL_MDC_REVALIDATE_PAUSE    0x800
 #define OBD_FAIL_MDC_ENQUEUE_PAUSE       0x801
@@ -686,8 +689,8 @@ static inline void obd_memory_sub(long size)
 #define __OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, flags)                   \
 do {                                                                         \
        (ptr) = (cptab) == NULL ?                                             \
-               kmalloc(size, flags | __GFP_ZERO) :                           \
-               cfs_cpt_malloc(cptab, cpt, size, flags | __GFP_ZERO);         \
+               kmalloc(size, (flags) | __GFP_ZERO) :                         \
+               cfs_cpt_malloc(cptab, cpt, size, (flags) | __GFP_ZERO);       \
        if (likely((ptr) != NULL))                                            \
                OBD_ALLOC_POST(ptr, size, "kmalloced");                       \
 } while (0)
@@ -800,10 +803,10 @@ do {                                                                            \
 
 #define __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, cptab, cpt, size, type)          \
 do {                                                                         \
-       LASSERT(ergo((type) != GFP_ATOMIC, !in_interrupt()));         \
+       LASSERT(ergo((type) != GFP_ATOMIC, !in_interrupt()));                 \
        (ptr) = (cptab) == NULL ?                                             \
-               kmem_cache_alloc(slab, type | __GFP_ZERO) :                   \
-               cfs_mem_cache_cpt_alloc(slab, cptab, cpt, type | __GFP_ZERO); \
+               kmem_cache_alloc(slab, (type) | __GFP_ZERO) :                 \
+               cfs_mem_cache_cpt_alloc(slab, cptab, cpt, (type) | __GFP_ZERO); \
        if (likely((ptr)))                                                    \
                OBD_ALLOC_POST(ptr, size, "slab-alloced");                    \
 } while(0)