LU-1146 build: batch update copyright messages

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

diff --git a/libcfs/include/libcfs/linux/linux-mem.h b/libcfs/include/libcfs/linux/linux-mem.h
index 18c64e7..80b71af 100644 (file)
--- a/libcfs/include/libcfs/linux/linux-mem.h
+++ b/libcfs/include/libcfs/linux/linux-mem.h
@@ -28,6 +28,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -98,6 +100,9 @@ static inline int cfs_page_count(cfs_page_t *page)
 
 #define cfs_page_index(p)       ((p)->index)
 
+#define cfs_page_pin(page) page_cache_get(page)
+#define cfs_page_unpin(page) page_cache_release(page)
+
 /*
  * Memory allocator
  * XXX Liang: move these declare to public file
@@ -108,12 +113,8 @@ extern void  cfs_free(void *addr);
 extern void *cfs_alloc_large(size_t nr_bytes);
 extern void  cfs_free_large(void *addr);
 
-extern cfs_page_t *cfs_alloc_pages(unsigned int flags, unsigned int order);
-extern void __cfs_free_pages(cfs_page_t *page, unsigned int order);
-
-#define cfs_alloc_page(flags)  cfs_alloc_pages(flags, 0)
-#define __cfs_free_page(page)  __cfs_free_pages(page, 0)
-#define cfs_free_page(p)       __free_pages(p, 0)
+extern cfs_page_t *cfs_alloc_page(unsigned int flags);
+extern void cfs_free_page(cfs_page_t *page);
 
 #define cfs_memory_pressure_get() (current->flags & PF_MEMALLOC)
 #define cfs_memory_pressure_set() do { current->flags |= PF_MEMALLOC; } while (0)
@@ -160,16 +161,59 @@ extern int cfs_mem_is_in_cache(const void *addr, const cfs_mem_cache_t *kmem);
 /*
  * Shrinker
  */
+#define cfs_shrinker    shrinker
+
+#ifdef HAVE_SHRINK_CONTROL
+# define SHRINKER_ARGS(sc, nr_to_scan, gfp_mask)  \
+                       struct shrinker *shrinker, \
+                       struct shrink_control *sc
+# define shrink_param(sc, var) ((sc)->var)
+#else
+# ifdef HAVE_SHRINKER_WANT_SHRINK_PTR
+#  define SHRINKER_ARGS(sc, nr_to_scan, gfp_mask)  \
+                        struct shrinker *shrinker, \
+                        int nr_to_scan, gfp_t gfp_mask
+# else
+#  define SHRINKER_ARGS(sc, nr_to_scan, gfp_mask)  \
+                        int nr_to_scan, gfp_t gfp_mask
+# endif
+# define shrink_param(sc, var) (var)
+#endif
+
+#ifdef HAVE_REGISTER_SHRINKER
+typedef int (*cfs_shrinker_t)(SHRINKER_ARGS(sc, nr_to_scan, gfp_mask));
+
+static inline
+struct cfs_shrinker *cfs_set_shrinker(int seek, cfs_shrinker_t func)
+{
+        struct shrinker *s;
 
-#ifndef HAVE_REGISTER_SHRINKER
-/* Shrinker callback */
-typedef shrinker_t cfs_shrinker_t;
-#define cfs_set_shrinker(seeks, shrinker) set_shrinker(seeks, shrinker)
-#define cfs_remove_shrinker(shrinker)     remove_shrinker(shrinker)
-#endif /* !HAVE_REGISTER_SHRINKER */
+        s = kmalloc(sizeof(*s), GFP_KERNEL);
+        if (s == NULL)
+                return (NULL);
 
-/* struct shrinker */
-#define cfs_shrinker shrinker
+        s->shrink = func;
+        s->seeks = seek;
+
+        register_shrinker(s);
+
+        return s;
+}
+
+static inline
+void cfs_remove_shrinker(struct cfs_shrinker *shrinker)
+{
+        if (shrinker == NULL)
+                return;
+
+        unregister_shrinker(shrinker);
+        kfree(shrinker);
+}
+#else
+typedef shrinker_t              cfs_shrinker_t;
+#define cfs_set_shrinker(s, f)  set_shrinker(s, f)
+#define cfs_remove_shrinker(s)  remove_shrinker(s)
+#endif
 
 #define CFS_DEFAULT_SEEKS                 DEFAULT_SEEKS
 #endif /* __LINUX_CFS_MEM_H__ */