Subject: [merged] staging-lustre-libcfs-cleanup-linux-memh.patch removed from -mm tree
To: bergwolf@xxxxxxxxx,andreas.dilger@xxxxxxxxx,dchinner@xxxxxxxxxx,mhocko@xxxxxxx,tao.peng@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Fri, 13 Sep 2013 14:16:39 -0700
The patch titled
Subject: staging/lustre/libcfs: cleanup linux-mem.h
has been removed from the -mm tree. Its filename was
staging-lustre-libcfs-cleanup-linux-memh.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peng Tao <bergwolf@xxxxxxxxx>
Subject: staging/lustre/libcfs: cleanup linux-mem.h
remove shrinker related wrappers.
Signed-off-by: Peng Tao <tao.peng@xxxxxxx>
Signed-off-by: Andreas Dilger <andreas.dilger@xxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxx>
Cc: Dave Chinner <dchinner@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h | 38 ----------
1 file changed, 38 deletions(-)
diff -puN drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h~staging-lustre-libcfs-cleanup-linux-memh drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h~staging-lustre-libcfs-cleanup-linux-memh
+++ a/drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h
@@ -79,42 +79,4 @@
do { __oldfs = get_fs(); set_fs(get_ds());} while(0)
#define MMSPACE_CLOSE set_fs(__oldfs)
-/*
- * Shrinker
- */
-
-# define SHRINKER_ARGS(sc, nr_to_scan, gfp_mask) \
- struct shrinker *shrinker, \
- struct shrink_control *sc
-# define shrink_param(sc, var) ((sc)->var)
-
-typedef int (*shrinker_t)(SHRINKER_ARGS(sc, nr_to_scan, gfp_mask));
-
-static inline
-struct shrinker *set_shrinker(int seek, shrinker_t func)
-{
- struct shrinker *s;
-
- s = kmalloc(sizeof(*s), GFP_KERNEL);
- if (s == NULL)
- return (NULL);
-
- s->shrink = func;
- s->seeks = seek;
-
- register_shrinker(s);
-
- return s;
-}
-
-static inline
-void remove_shrinker(struct shrinker *shrinker)
-{
- if (shrinker == NULL)
- return;
-
- unregister_shrinker(shrinker);
- kfree(shrinker);
-}
-
#endif /* __LINUX_CFS_MEM_H__ */
_
Patches currently in -mm which might be from bergwolf@xxxxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
