X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fobd_support.h;h=714410d96f190adbf92a36f3c4fa20b5bb2a0e87;hb=8d1e7317b3ce28a6909e139bee5ad84b787d7c7f;hp=a537840aa30d61e7cf9e6060f07cfde70d2ab213;hpb=7023698133970372031a16beac276e5e3e64cfbe;p=fs%2Flustre-release.git diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index a537840..714410d 100644 --- 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 @@ -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 @@ -321,6 +323,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 @@ -386,6 +390,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSC_CP_ENQ_RACE 0x410 #define OBD_FAIL_OSC_NO_GRANT 0x411 #define OBD_FAIL_OSC_DELAY_SETTIME 0x412 +#define OBD_FAIL_OSC_CONNECT_GRANT_PARAM 0x413 #define OBD_FAIL_PTLRPC 0x500 #define OBD_FAIL_PTLRPC_ACK 0x501 @@ -438,6 +443,8 @@ 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_TGT_REPLAY_TIMEOUT 0x717 #define OBD_FAIL_MDC_REVALIDATE_PAUSE 0x800 #define OBD_FAIL_MDC_ENQUEUE_PAUSE 0x801 @@ -460,6 +467,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 @@ -504,6 +512,8 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LLITE_XATTR_ENOMEM 0x1405 #define OBD_FAIL_MAKE_LOVEA_HOLE 0x1406 #define OBD_FAIL_LLITE_LOST_LAYOUT 0x1407 +#define OBD_FAIL_LLITE_NO_CHECK_DEAD 0x1408 +#define OBD_FAIL_GETATTR_DELAY 0x1409 #define OBD_FAIL_FID_INDIR 0x1501 #define OBD_FAIL_FID_INLMA 0x1502 @@ -554,6 +564,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_LFSCK_LOST_SLAVE_LMV 0x162a #define OBD_FAIL_LFSCK_BAD_SLAVE_LMV 0x162b #define OBD_FAIL_LFSCK_BAD_SLAVE_NAME 0x162c +#define OBD_FAIL_LFSCK_ASSISTANT_DIRECT 0x162d #define OBD_FAIL_LFSCK_NOTIFY_NET 0x16f0 #define OBD_FAIL_LFSCK_QUERY_NET 0x16f1 @@ -564,6 +575,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_SPLIT_UPDATE_REC 0x1702 #define OBD_FAIL_LARGE_STRIPE 0x1703 #define OBD_FAIL_OUT_ENOSPC 0x1704 +#define OBD_FAIL_INVALIDATE_UPDATE 0x1705 /* MIGRATE */ #define OBD_FAIL_MIGRATE_NET_REP 0x1800 @@ -686,8 +698,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) @@ -748,8 +760,6 @@ do { \ OBD_CPT_VMALLOC(ptr, cptab, cpt, size); \ } while (0) -#define OBD_FREE_LARGE(ptr, size) OBD_FREE(ptr, size) - #ifdef CONFIG_DEBUG_SLAB #define POISON(ptr, c, s) do {} while (0) #define POISON_PTR(ptr) ((void)0) @@ -759,23 +769,29 @@ do { \ #endif #ifdef POISON_BULK -#define POISON_PAGE(page, val) do { memset(kmap(page), val, PAGE_CACHE_SIZE); \ +#define POISON_PAGE(page, val) do { memset(kmap(page), val, PAGE_CACHE_SIZE); \ kunmap(page); } while (0) #else #define POISON_PAGE(page, val) do { } while (0) #endif -#define OBD_FREE(ptr, size) \ -do { \ - if (is_vmalloc_addr(ptr)) { \ +#define OBD_FREE(ptr, size) \ +do { \ + OBD_FREE_PRE(ptr, size, "kfreed"); \ + kfree(ptr); \ + POISON_PTR(ptr); \ +} while (0) + +#define OBD_FREE_LARGE(ptr, size) \ +do { \ + if (is_vmalloc_addr(ptr)) { \ OBD_FREE_PRE(ptr, size, "vfreed"); \ - vfree(ptr); \ - } else { \ - OBD_FREE_PRE(ptr, size, "kfreed"); \ - kfree(ptr); \ + vfree(ptr); \ + POISON_PTR(ptr); \ + } else { \ + OBD_FREE(ptr, size); \ } \ - POISON_PTR(ptr); \ -} while(0) +} while (0) #define OBD_FREE_RCU(ptr, size, handle) \ do { \ @@ -800,10 +816,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)