summaryrefslogtreecommitdiffstats
path: root/drivers/staging/lustre/lustre/include/obd_support.h
diff options
context:
space:
mode:
authorDmitry Eremin <dmiter4ever@gmail.com>2015-05-30 23:27:05 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 15:26:38 +0900
commite4ba525e8f5f78d5e40ced1f80c50b05aaa01ecb (patch)
tree1493e39c2a4a18823d1d88d230c201073fac4816 /drivers/staging/lustre/lustre/include/obd_support.h
parentd9528a30a8361a1af1f436129e2eb9165a3cbc5b (diff)
downloadlinux-0-day-e4ba525e8f5f78d5e40ced1f80c50b05aaa01ecb.tar.gz
linux-0-day-e4ba525e8f5f78d5e40ced1f80c50b05aaa01ecb.tar.xz
staging/lustre/obd: final removal of procfs stuff
Signed-off-by: Dmitry Eremin <dmiter4ever@gmail.com> Signed-off-by: Oleg Drokin <oleg.drokin@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre/lustre/include/obd_support.h')
-rw-r--r--drivers/staging/lustre/lustre/include/obd_support.h41
1 files changed, 0 insertions, 41 deletions
diff --git a/drivers/staging/lustre/lustre/include/obd_support.h b/drivers/staging/lustre/lustre/include/obd_support.h
index c0136ee778e32..73e2d4880b9b3 100644
--- a/drivers/staging/lustre/lustre/include/obd_support.h
+++ b/drivers/staging/lustre/lustre/include/obd_support.h
@@ -509,7 +509,6 @@ extern atomic_t libcfs_kmemory;
extern void obd_update_maxusage(void);
-#if defined (CONFIG_PROC_FS)
#define obd_memory_add(size) \
lprocfs_counter_add(obd_memory, OBD_MEMORY_STAT, (long)(size))
#define obd_memory_sub(size) \
@@ -530,46 +529,6 @@ extern void obd_update_maxusage(void);
extern __u64 obd_memory_max(void);
extern __u64 obd_pages_max(void);
-#else
-
-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)
-{
- obd_alloc += size;
- if (obd_alloc > obd_max_alloc)
- obd_max_alloc = obd_alloc;
-}
-
-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
-
#define OBD_DEBUG_MEMUSAGE (1)
#if OBD_DEBUG_MEMUSAGE