staging: lustre: remove unused OBD_PAGE_ALLOC/FREE and friends

[karo-tx-linux.git] / drivers / staging / lustre / lustre / include / obd_support.h

diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index 62d76b5031b603dae33e16f49e00f5c38694ed39..a22a5308fb48d0de96b67cac62ea2bc41e92ec74 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -43,13 +43,6 @@
 #include "lprocfs_status.h"
 
 /* global variables */
-extern struct lprocfs_stats *obd_memory;
-enum {
-       OBD_MEMORY_STAT = 0,
-       OBD_MEMORY_PAGES_STAT = 1,
-       OBD_STATS_NUM,
-};
-
 extern unsigned int obd_debug_peer_on_timeout;
 extern unsigned int obd_dump_on_timeout;
 extern unsigned int obd_dump_on_eviction;
@@ -479,7 +472,6 @@ extern char obd_jobid_var[];
 #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)
@@ -522,88 +514,7 @@ do {                                                                             \
        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
- * love to assert on that, but slab.c keeps kmem_cache_s all to itself. */
-#define OBD_SLAB_FREE_RTN0(ptr, slab)                                   \
-({                                                                         \
-       kmem_cache_free((slab), (ptr));                             \
-       (ptr) = NULL;                                                    \
-       0;                                                                  \
-})
-
-#define __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, cptab, cpt, size, type)          \
-do {                                                                         \
-       LASSERT(ergo((type) != GFP_ATOMIC, !in_interrupt()));         \
-       (ptr) = (cptab) == NULL ?                                             \
-               kmem_cache_alloc(slab, type | __GFP_ZERO) :             \
-               kmem_cache_alloc_node(slab, type | __GFP_ZERO,          \
-                                     cfs_cpt_spread_node(cptab, cpt)); \
-} while (0)
-
-#define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags)                           \
-       __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, NULL, 0, size, flags)
-#define OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size, flags)           \
-       __OBD_SLAB_ALLOC_VERBOSE(ptr, slab, cptab, cpt, size, flags)
-
-#define OBD_SLAB_FREE(ptr, slab, size)                                 \
-do {                                                                     \
-       kmem_cache_free(slab, ptr);                                     \
-       POISON_PTR(ptr);                                                      \
-} while (0)
-
-#define OBD_SLAB_ALLOC(ptr, slab, size)                                              \
-       OBD_SLAB_ALLOC_GFP(ptr, slab, size, GFP_NOFS)
-
-#define OBD_SLAB_CPT_ALLOC(ptr, slab, cptab, cpt, size)                              \
-       OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size, GFP_NOFS)
-
-#define OBD_SLAB_ALLOC_PTR(ptr, slab)                                        \
-       OBD_SLAB_ALLOC(ptr, slab, sizeof(*(ptr)))
-
-#define OBD_SLAB_CPT_ALLOC_PTR(ptr, slab, cptab, cpt)                        \
-       OBD_SLAB_CPT_ALLOC(ptr, slab, cptab, cpt, sizeof(*(ptr)))
-
-#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, cptab, cpt, flags)                     \
-       OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, sizeof(*(ptr)), flags)
-
-#define OBD_SLAB_FREE_PTR(ptr, slab)                                         \
-       OBD_SLAB_FREE((ptr), (slab), sizeof(*(ptr)))
-
 #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) :                                \
-               alloc_pages_node(cfs_cpt_spread_node(cptab, cpt), gfp_mask, 0);\
-       if (ptr) {                                      \
-               CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / "      \
-                      "%llu bytes at %p.\n",                           \
-                      (int)1,                                          \
-                      (__u64)(1 << PAGE_CACHE_SHIFT), ptr);                \
-       }                                                                    \
-} while (0)
-
-#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)
-
-#define OBD_PAGE_FREE(ptr)                                                 \
-do {                                                                     \
-       LASSERT(ptr);                                                    \
-       CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / %llu bytes " \
-              "at %p.\n",                                                  \
-              (int)1, (__u64)(1 << PAGE_CACHE_SHIFT),                    \
-              ptr);                                                      \
-       __free_page(ptr);                                                  \
-       (ptr) = (void *)0xdeadbeef;                                        \
-} while (0)
-
 #endif