Whamcloud - gitweb
LU-8726 osd-ldiskfs: bypass read for benchmarking
[fs/lustre-release.git] / lustre / include / obd_support.h
index a4d400a..fdf2a3b 100644 (file)
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -54,7 +50,6 @@
 extern struct lprocfs_stats *obd_memory;
 enum {
         OBD_MEMORY_STAT = 0,
-        OBD_MEMORY_PAGES_STAT = 1,
         OBD_STATS_NUM,
 };
 
@@ -76,13 +71,8 @@ extern int at_extra;
 extern unsigned long obd_max_dirty_pages;
 extern atomic_long_t obd_dirty_pages;
 extern atomic_long_t obd_dirty_transit_pages;
-extern unsigned int obd_alloc_fail_rate;
 extern char obd_jobid_var[];
 
-/* lvfs.c */
-int obd_alloc_fail(const void *ptr, const char *name, const char *type,
-                   size_t size, const char *file, int line);
-
 /* Some hash init argument constants */
 #define HASH_POOLS_BKT_BITS 3
 #define HASH_POOLS_CUR_BITS 3
@@ -189,8 +179,8 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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
@@ -250,6 +240,16 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_MDS_RENAME3             0x155
 #define OBD_FAIL_MDS_RENAME4             0x156
 #define OBD_FAIL_MDS_LDLM_REPLY_NET     0x157
+#define OBD_FAIL_MDS_STALE_DIR_LAYOUT   0x158
+#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
+#define OBD_FAIL_MDS_XATTR_REP                 0x161
+#define OBD_FAIL_MDS_TRACK_OVERFLOW     0x162
+#define OBD_FAIL_MDS_LOV_CREATE_RACE    0x163
+#define OBD_FAIL_MDS_OSP_PRECREATE_WAIT         0x164
 
 /* layout lock */
 #define OBD_FAIL_MDS_NO_LL_GETATTR      0x170
@@ -299,7 +299,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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
@@ -322,6 +322,11 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_OST_STATFS_EINPROGRESS  0x231
 #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_OST_LADVISE_PAUSE      0x237
+#define OBD_FAIL_OST_FAKE_RW            0x238
 
 #define OBD_FAIL_LDLM                    0x300
 #define OBD_FAIL_LDLM_NAMESPACE_NEW      0x301
@@ -353,15 +358,19 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_LDLM_AGL_NOLOCK         0x31b
 #define OBD_FAIL_LDLM_OST_LVB           0x31c
 #define OBD_FAIL_LDLM_ENQUEUE_HANG      0x31d
+#define OBD_FAIL_LDLM_BL_EVICT           0x31e
 #define OBD_FAIL_LDLM_PAUSE_CANCEL2      0x31f
 #define OBD_FAIL_LDLM_CP_CB_WAIT2        0x320
 #define OBD_FAIL_LDLM_CP_CB_WAIT3        0x321
 #define OBD_FAIL_LDLM_CP_CB_WAIT4        0x322
 #define OBD_FAIL_LDLM_CP_CB_WAIT5        0x323
-
 #define OBD_FAIL_LDLM_SRV_BL_AST        0x324
 #define OBD_FAIL_LDLM_SRV_CP_AST        0x325
 #define OBD_FAIL_LDLM_SRV_GL_AST        0x326
+#define OBD_FAIL_LDLM_WATERMARK_LOW     0x327
+#define OBD_FAIL_LDLM_WATERMARK_HIGH    0x328
+
+#define OBD_FAIL_LDLM_GRANT_CHECK        0x32a
 
 /* LOCKLESS IO */
 #define OBD_FAIL_LDLM_SET_CONTENTION     0x385
@@ -385,6 +394,8 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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_OSC_DELAY_IO            0x414
 
 #define OBD_FAIL_PTLRPC                  0x500
 #define OBD_FAIL_PTLRPC_ACK              0x501
@@ -408,6 +419,9 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB2  0x515
 #define OBD_FAIL_PTLRPC_DELAY_IMP_FULL   0x516
 #define OBD_FAIL_PTLRPC_CANCEL_RESEND    0x517
+#define OBD_FAIL_PTLRPC_DROP_BULK       0x51a
+#define OBD_FAIL_PTLRPC_LONG_REQ_UNLINK  0x51b
+#define OBD_FAIL_PTLRPC_LONG_BOTH_UNLINK 0x51c
 #define OBD_FAIL_PTLRPC_CLIENT_BULK_CB3  0x520
 
 #define OBD_FAIL_OBD_PING_NET            0x600
@@ -420,6 +434,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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_OBDCLASS_MODULE_LOAD   0x60a
 
 #define OBD_FAIL_TGT_REPLY_NET           0x700
 #define OBD_FAIL_TGT_CONN_RACE           0x701
@@ -437,6 +452,11 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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_TGT_CLIENT_DEL                 0x718
+#define OBD_FAIL_TGT_SLUGGISH_NET       0x719
+#define OBD_FAIL_TGT_RCVD_EIO           0x720
 
 #define OBD_FAIL_MDC_REVALIDATE_PAUSE    0x800
 #define OBD_FAIL_MDC_ENQUEUE_PAUSE       0x801
@@ -444,6 +464,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_MDC_GETATTR_ENQUEUE     0x803
 #define OBD_FAIL_MDC_RPCS_SEM           0x804
 #define OBD_FAIL_MDC_LIGHTWEIGHT        0x805
+#define OBD_FAIL_MDC_CLOSE              0x806
 
 #define OBD_FAIL_MGS                     0x900
 #define OBD_FAIL_MGS_ALL_REQUEST_NET     0x901
@@ -459,6 +480,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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
@@ -467,8 +489,6 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 
 #define OBD_FAIL_LPROC_REMOVE            0xB00
 
-#define OBD_FAIL_GENERAL_ALLOC           0xC00
-
 #define OBD_FAIL_SEQ                     0x1000
 #define OBD_FAIL_SEQ_QUERY_NET           0x1001
 #define OBD_FAIL_SEQ_EXHAUST            0x1002
@@ -495,6 +515,7 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_LLOG_CATINFO_NET                   0x1309
 #define OBD_FAIL_MDS_SYNC_CAPA_SL                   0x1310
 #define OBD_FAIL_SEQ_ALLOC                          0x1311
+#define OBD_FAIL_CAT_RECORDS                       0x1312
 
 #define OBD_FAIL_LLITE                              0x1400
 #define OBD_FAIL_LLITE_FAULT_TRUNC_RACE             0x1401
@@ -504,6 +525,12 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #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_LLITE_CREATE_FILE_PAUSE           0x1409
+#define OBD_FAIL_LLITE_NEWNODE_PAUSE               0x140a
+#define OBD_FAIL_LLITE_SETDIRSTRIPE_PAUSE          0x140b
+
 
 #define OBD_FAIL_FID_INDIR     0x1501
 #define OBD_FAIL_FID_INLMA     0x1502
@@ -546,14 +573,14 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_LFSCK_MUL_REF         0x1622
 #define OBD_FAIL_LFSCK_BAD_TYPE                0x1623
 #define OBD_FAIL_LFSCK_NO_NAMEENTRY    0x1624
-#define OBD_FAIL_LFSCK_MORE_NLINK      0x1625
 #define OBD_FAIL_LFSCK_LESS_NLINK      0x1626
-#define OBD_FAIL_LFSCK_LINKEA_OVERFLOW 0x1627
 #define OBD_FAIL_LFSCK_BAD_NAME_HASH   0x1628
 #define OBD_FAIL_LFSCK_LOST_MASTER_LMV 0x1629
 #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_LOST_MDTOBJ2    0x162e
 
 #define OBD_FAIL_LFSCK_NOTIFY_NET      0x16f0
 #define OBD_FAIL_LFSCK_QUERY_NET       0x16f1
@@ -561,6 +588,10 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 /* UPDATE */
 #define OBD_FAIL_OUT_UPDATE_NET                0x1700
 #define OBD_FAIL_OUT_UPDATE_NET_REP    0x1701
+#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
@@ -597,6 +628,18 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type,
 #define OBD_FAIL_DT_DECLARE_DELETE             0x2016
 #define OBD_FAIL_DT_DELETE                     0x2017
 #define OBD_FAIL_DT_LOOKUP                     0x2018
+#define OBD_FAIL_DT_TXN_STOP                   0x2019
+
+#define OBD_FAIL_OSP_CHECK_INVALID_REC         0x2100
+#define OBD_FAIL_OSP_CHECK_ENOMEM              0x2101
+#define OBD_FAIL_OSP_FAKE_PRECREATE            0x2102
+
+ /* barrier */
+#define OBD_FAIL_MGS_BARRIER_READ_NET          0x2200
+#define OBD_FAIL_MGS_BARRIER_NOTIFY_NET                0x2201
+
+#define OBD_FAIL_BARRIER_DELAY                 0x2202
+#define OBD_FAIL_BARRIER_FAILURE               0x2203
 
 /* Assign references to moved code to reduce code changes */
 #define OBD_FAIL_PRECHECK(id)                   CFS_FAIL_PRECHECK(id)
@@ -627,27 +670,15 @@ extern atomic_t libcfs_kmemory;
 #define obd_memory_sum()                                                      \
         lprocfs_stats_collector(obd_memory, OBD_MEMORY_STAT,                  \
                                 LPROCFS_FIELDS_FLAGS_SUM)
-#define obd_pages_add(order)                                                  \
-        lprocfs_counter_add(obd_memory, OBD_MEMORY_PAGES_STAT,                \
-                            (long)(1 << (order)))
-#define obd_pages_sub(order)                                                  \
-        lprocfs_counter_sub(obd_memory, OBD_MEMORY_PAGES_STAT,                \
-                            (long)(1 << (order)))
-#define obd_pages_sum()                                                       \
-        lprocfs_stats_collector(obd_memory, OBD_MEMORY_PAGES_STAT,            \
-                                LPROCFS_FIELDS_FLAGS_SUM)
 
 extern void obd_update_maxusage(void);
 extern __u64 obd_memory_max(void);
-extern __u64 obd_pages_max(void);
 
 #else /* CONFIG_PROC_FS */
 
 extern __u64 obd_alloc;
-extern __u64 obd_pages;
 
 extern __u64 obd_max_alloc;
-extern __u64 obd_max_pages;
 
 static inline void obd_memory_add(long size)
 {
@@ -661,23 +692,9 @@ static inline void obd_memory_sub(long size)
         obd_alloc -= size;
 }
 
-static inline void obd_pages_add(int order)
-{
-        obd_pages += 1<< order;
-        if (obd_pages > obd_max_pages)
-                obd_max_pages = obd_pages;
-}
-
-static inline void obd_pages_sub(int order)
-{
-        obd_pages -= 1<< order;
-}
-
 #define obd_memory_sum() (obd_alloc)
-#define obd_pages_sum()  (obd_pages)
 
 #define obd_memory_max() (obd_max_alloc)
-#define obd_pages_max() (obd_max_pages)
 
 #endif /* !CONFIG_PROC_FS */
 
@@ -703,35 +720,13 @@ static inline void obd_pages_sub(int order)
 
 #endif /* !OBD_DEBUG_MEMUSAGE */
 
-#ifdef RANDOM_FAIL_ALLOC
-#define HAS_FAIL_ALLOC_FLAG OBD_FAIL_CHECK(OBD_FAIL_GENERAL_ALLOC)
-#else
-#define HAS_FAIL_ALLOC_FLAG 0
-#endif
-
-#define OBD_ALLOC_FAIL_BITS 24
-#define OBD_ALLOC_FAIL_MASK ((1 << OBD_ALLOC_FAIL_BITS) - 1)
-#define OBD_ALLOC_FAIL_MULT (OBD_ALLOC_FAIL_MASK / 100)
-
-#define OBD_FREE_RTN0(ptr)                                                    \
-({                                                                            \
-       kfree(ptr);                                                        \
-        (ptr) = NULL;                                                         \
-        0;                                                                    \
-})
-
 #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);         \
-        if (likely((ptr) != NULL &&                                           \
-                   (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 ||       \
-                    !obd_alloc_fail(ptr, #ptr, "km", size,                    \
-                                    __FILE__, __LINE__) ||                    \
-                    OBD_FREE_RTN0(ptr)))){                                    \
-                OBD_ALLOC_POST(ptr, size, "kmalloced");                       \
-        }                                                                     \
+               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)
 
 #define OBD_ALLOC_GFP(ptr, size, gfp_mask)                                   \
@@ -764,7 +759,7 @@ do {                                                                              \
        if (unlikely((ptr) == NULL)) {                                        \
                CERROR("vmalloc of '" #ptr "' (%d bytes) failed\n",           \
                       (int)(size));                                          \
-               CERROR(LPU64" total bytes allocated by Lustre, %d by LNET\n", \
+               CERROR("%llu total bytes allocated by Lustre, %d by LNET\n", \
                       obd_memory_sum(), atomic_read(&libcfs_kmemory));       \
        } else {                                                              \
                OBD_ALLOC_POST(ptr, size, "vmalloced");                       \
@@ -778,7 +773,11 @@ do {                                                                             \
 
 #define OBD_ALLOC_LARGE(ptr, size)                                            \
 do {                                                                          \
-       OBD_ALLOC_GFP(ptr, size, GFP_NOFS | __GFP_NOWARN);                    \
+       /* LU-8196 - force large allocations to use vmalloc, not kmalloc */   \
+       if ((size) > KMALLOC_MAX_SIZE)                                          \
+               ptr = NULL;                                                   \
+       else                                                                  \
+               OBD_ALLOC_GFP(ptr, size, GFP_NOFS | __GFP_NOWARN);            \
        if (ptr == NULL)                                                      \
                 OBD_VMALLOC(ptr, size);                                       \
 } while (0)
@@ -790,8 +789,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)
@@ -801,23 +798,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_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 {                                                                         \
@@ -842,17 +845,12 @@ 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); \
-        if (likely((ptr) != NULL &&                                           \
-                   (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 ||       \
-                    !obd_alloc_fail(ptr, #ptr, "slab-", size,                 \
-                                    __FILE__, __LINE__) ||                    \
-                    OBD_SLAB_FREE_RTN0(ptr, slab)))) {                        \
-                OBD_ALLOC_POST(ptr, size, "slab-alloced");                    \
-        }                                                                     \
+               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)
 
 #define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags)                           \
@@ -893,47 +891,16 @@ do {                                                                          \
 #define KEY_IS(str) \
         (keylen >= (sizeof(str)-1) && memcmp(key, str, (sizeof(str)-1)) == 0)
 
-/* Wrapper for contiguous page frame allocation */
-#define __OBD_PAGE_ALLOC_VERBOSE(ptr, cptab, cpt, gfp_mask)                  \
-do {                                                                         \
-       (ptr) = (cptab) == NULL ?                                             \
-               alloc_page(gfp_mask) :                                \
-               cfs_page_cpt_alloc(cptab, cpt, gfp_mask);                     \
-        if (unlikely((ptr) == NULL)) {                                        \
-                CERROR("alloc_pages of '" #ptr "' %d page(s) / "LPU64" bytes "\
-                       "failed\n", (int)1,                                    \
-                      (__u64)(1 << PAGE_CACHE_SHIFT));                         \
-                CERROR(LPU64" total bytes and "LPU64" total pages "           \
-                       "("LPU64" bytes) allocated by Lustre, "                \
-                       "%d total bytes by LNET\n",                            \
-                       obd_memory_sum(),                                      \
-                      obd_pages_sum() << PAGE_CACHE_SHIFT,                   \
-                      obd_pages_sum(),                                       \
-                      atomic_read(&libcfs_kmemory));                         \
-       } else {                                                              \
-               obd_pages_add(0);                                             \
-                CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / "      \
-                       LPU64" bytes at %p.\n",                                \
-                       (int)1,                                                \
-                      (__u64)(1 << PAGE_CACHE_SHIFT), ptr);                    \
-        }                                                                     \
-} while (0)
+/* LUSTRE_LMA_FL_MASKS defines which flags will be stored in LMA */
 
-#define OBD_PAGE_ALLOC(ptr, gfp_mask)                                        \
-       __OBD_PAGE_ALLOC_VERBOSE(ptr, NULL, 0, gfp_mask)
-#define OBD_PAGE_CPT_ALLOC(ptr, cptab, cpt, gfp_mask)                        \
-       __OBD_PAGE_ALLOC_VERBOSE(ptr, cptab, cpt, gfp_mask)
+static inline int lma_to_lustre_flags(__u32 lma_flags)
+{
+       return (lma_flags & LMAI_ORPHAN) ? LUSTRE_ORPHAN_FL : 0;
+}
 
-#define OBD_PAGE_FREE(ptr)                                                    \
-do {                                                                          \
-        LASSERT(ptr);                                                         \
-        obd_pages_sub(0);                                                     \
-        CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / "LPU64" bytes " \
-               "at %p.\n",                                                    \
-              (int)1, (__u64)(1 << PAGE_CACHE_SHIFT),                          \
-               ptr);                                                          \
-       __free_page(ptr);                                                   \
-        (ptr) = (void *)0xdeadbeef;                                           \
-} while (0)
+static inline int lustre_to_lma_flags(__u32 la_flags)
+{
+       return (la_flags & LUSTRE_ORPHAN_FL) ? LMAI_ORPHAN : 0;
+}
 
 #endif