LU-2915 lfsck: LFSCK 1.5 technical debts (3)

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

diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h
index 79ec6aa..9739e0e 100644 (file)
--- a/lustre/include/obd_support.h
+++ b/lustre/include/obd_support.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -239,7 +239,9 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_MDS_HSM_REQUEST_NET           0x14c
 #define OBD_FAIL_MDS_HSM_CT_REGISTER_NET       0x14d
 #define OBD_FAIL_MDS_HSM_CT_UNREGISTER_NET     0x14e
+#define OBD_FAIL_MDS_SWAP_LAYOUTS_NET          0x14f
 #define OBD_FAIL_MDS_HSM_ACTION_NET            0x150
+#define OBD_FAIL_MDS_CHANGELOG_INIT            0x151
 
 /* layout lock */
 #define OBD_FAIL_MDS_NO_LL_GETATTR      0x170
@@ -261,6 +263,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_OSD_SCRUB_CRASH                       0x191
 #define OBD_FAIL_OSD_SCRUB_FATAL                       0x192
 #define OBD_FAIL_OSD_FID_MAPPING                       0x193
+#define OBD_FAIL_OSD_LMA_INCOMPAT                      0x194
 
 #define OBD_FAIL_OST                     0x200
 #define OBD_FAIL_OST_CONNECT_NET         0x201
@@ -335,6 +338,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_LDLM_NEW_LOCK           0x319
 #define OBD_FAIL_LDLM_AGL_DELAY          0x31a
 #define OBD_FAIL_LDLM_AGL_NOLOCK         0x31b
+#define OBD_FAIL_LDLM_OST_LVB           0x31c
 
 /* LOCKLESS IO */
 #define OBD_FAIL_LDLM_SET_CONTENTION     0x385
@@ -391,6 +395,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_OBD_LOG_CANCEL_REP      0x606
 #define OBD_FAIL_OBD_IDX_READ_NET        0x607
 #define OBD_FAIL_OBD_IDX_READ_BREAK     0x608
+#define OBD_FAIL_OBD_NO_LRU             0x609
 
 #define OBD_FAIL_TGT_REPLY_NET           0x700
 #define OBD_FAIL_TGT_CONN_RACE           0x701
@@ -461,13 +466,29 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_LOV_INIT                          0x1403
 #define OBD_FAIL_GLIMPSE_DELAY                     0x1404
 
-#define OBD_FAIL_UPDATE_OBJ_NET                                0x1500
+#define OBD_FAIL_FID_INDIR     0x1501
+#define OBD_FAIL_FID_INLMA     0x1502
+#define OBD_FAIL_FID_IGIF      0x1504
+#define OBD_FAIL_FID_LOOKUP    0x1505
+#define OBD_FAIL_FID_NOLMA     0x1506
 
 /* LFSCK */
 #define OBD_FAIL_LFSCK_DELAY1          0x1600
 #define OBD_FAIL_LFSCK_DELAY2          0x1601
+#define OBD_FAIL_LFSCK_DELAY3          0x1602
+#define OBD_FAIL_LFSCK_LINKEA_CRASH    0x1603
+#define OBD_FAIL_LFSCK_LINKEA_MORE     0x1604
+#define OBD_FAIL_LFSCK_LINKEA_MORE2    0x1605
 #define OBD_FAIL_LFSCK_FATAL1          0x1608
 #define OBD_FAIL_LFSCK_FATAL2          0x1609
+#define OBD_FAIL_LFSCK_CRASH           0x160a
+#define OBD_FAIL_LFSCK_NO_AUTO         0x160b
+#define OBD_FAIL_LFSCK_NO_DOUBLESCAN   0x160c
+
+/* UPDATE */
+#define OBD_FAIL_UPDATE_OBJ_NET                        0x1700
+#define OBD_FAIL_UPDATE_OBJ_NET_REP            0x1701
+
 
 /* Assign references to moved code to reduce code changes */
 #define OBD_FAIL_PRECHECK(id)                   CFS_FAIL_PRECHECK(id)
@@ -636,15 +657,6 @@ do {                                                                             \
 #define OBD_CPT_ALLOC_PTR(ptr, cptab, cpt)                                   \
        OBD_CPT_ALLOC(ptr, cptab, cpt, sizeof *(ptr))
 
-#ifdef __arch_um__
-
-# define OBD_VMALLOC(ptr, size)                                                      \
-        OBD_ALLOC(ptr, size)
-# define OBD_CPT_VMALLOC(ptr, cptab, cpt, size)                                      \
-        OBD_CPT_ALLOC(ptr, cptab, cpt, size)
-
-#else /* !__arch_um__ */
-
 # define __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size)                        \
 do {                                                                         \
        (ptr) = cptab == NULL ?                                               \
@@ -666,8 +678,6 @@ do {                                                                              \
 # define OBD_CPT_VMALLOC(ptr, cptab, cpt, size)                                      \
         __OBD_VMALLOC_VEROBSE(ptr, cptab, cpt, size)
 
-#endif
-
 #ifdef __KERNEL__
 
 /* Allocations above this size are considered too big and could not be done
@@ -754,16 +764,12 @@ do {                                                                            \
 #define OBD_FREE_RCU(ptr, size, handle) (OBD_FREE(ptr, size))
 #endif /* ifdef __KERNEL__ */
 
-#ifdef __arch_um__
-# define OBD_VFREE(ptr, size) OBD_FREE(ptr, size)
-#else
-# define OBD_VFREE(ptr, size)                                                 \
-do {                                                                          \
-        OBD_FREE_PRE(ptr, size, "vfreed");                                    \
-        cfs_free_large(ptr);                                                  \
-        POISON_PTR(ptr);                                                      \
-} while(0)
-#endif
+#define OBD_VFREE(ptr, size)                           \
+       do {                                            \
+               OBD_FREE_PRE(ptr, size, "vfreed");      \
+               cfs_free_large(ptr);                    \
+               POISON_PTR(ptr);                        \
+       } while (0)
 
 /* we memset() the slab object to 0 when allocation succeeds, so DO NOT
  * HAVE A CTOR THAT DOES ANYTHING.  its work will be cleared here.  we'd
@@ -777,7 +783,7 @@ do {                                                                          \
 
 #define __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, cptab, cpt, size, type)          \
 do {                                                                         \
-        LASSERT(ergo(type != CFS_ALLOC_ATOMIC, !cfs_in_interrupt()));         \
+       LASSERT(ergo((type) != CFS_ALLOC_ATOMIC, !cfs_in_interrupt()));       \
        (ptr) = (cptab) == NULL ?                                             \
                cfs_mem_cache_alloc(slab, type) :                             \
                cfs_mem_cache_cpt_alloc(slab, cptab, cpt, type);              \
@@ -820,7 +826,7 @@ do {                                                                          \
 #define OBD_SLAB_ALLOC_PTR_GFP(ptr, slab, flags)                             \
        OBD_SLAB_ALLOC_GFP(ptr, slab, sizeof *(ptr), flags)
 
-#define OBD_SLAB_CPT_ALLOC_PTR_GFP(ptr, slab, ctab, cpt, flags)                      \
+#define OBD_SLAB_CPT_ALLOC_PTR_GFP(ptr, slab, cptab, cpt, flags)                     \
        OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, sizeof *(ptr), flags)
 
 #define OBD_SLAB_FREE_PTR(ptr, slab)                                         \