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 c0419ba..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/
@@ -263,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
@@ -465,8 +466,6 @@ 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
@@ -479,12 +478,18 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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)
 #define OBD_FAIL_CHECK(id)                      CFS_FAIL_CHECK(id)
@@ -778,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);              \
@@ -821,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)                                         \