- More changes in the connection handle stuff. We are back to where

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

diff --git a/lustre/include/linux/obd_support.h b/lustre/include/linux/obd_support.h
index b3d9ec1..1ad9902 100644 (file)
--- a/lustre/include/linux/obd_support.h
+++ b/lustre/include/linux/obd_support.h
@@ -57,6 +57,11 @@ extern unsigned long obd_fail_loc;
 #define OBD_FAIL_MDS_CONNECT_NET         0x117
 #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_STATFS_PACK         0x11d
+#define OBD_FAIL_MDS_STATFS_NET          0x11e
 
 #define OBD_FAIL_OST                     0x200
 #define OBD_FAIL_OST_CONNECT_NET         0x201
@@ -70,6 +75,7 @@ extern unsigned long obd_fail_loc;
 #define OBD_FAIL_OST_CLOSE_NET           0x209
 #define OBD_FAIL_OST_BRW_NET             0x20a
 #define OBD_FAIL_OST_PUNCH_NET           0x20b
+#define OBD_FAIL_OST_STATFS_NET          0x20c
 
 #define OBB_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
@@ -104,6 +110,11 @@ do {                                                                         \
 #include <linux/types.h>
 #include <linux/blkdev.h>
 
+static inline void fixme(void)
+{
+        CERROR("FIXME\n");
+}
+
 static inline void OBD_FAIL_WRITE(int id, kdev_t dev)
 {
         if (OBD_FAIL_CHECK(id)) {
@@ -139,9 +150,9 @@ do {                                                                    \
 do {                                                                    \
         int s = (size);                                                 \
         kfree((ptr));                                                   \
+        obd_memory -= s;                                                \
         CDEBUG(D_MALLOC, "kfreed '" #ptr "': %d at %p (tot %ld).\n",    \
                s, (ptr), obd_memory);                                   \
-        obd_memory -= s;                                                \
 } while (0)
 
 #endif