Subject: + staging-lustre-libcfs-cleanup-linux-memh.patch added to -mm tree To: bergwolf@xxxxxxxxx,andreas.dilger@xxxxxxxxx,dchinner@xxxxxxxxxx,mhocko@xxxxxxx,tao.peng@xxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 11 Jun 2013 12:51:46 -0700 The patch titled Subject: staging/lustre/libcfs: cleanup linux-mem.h has been added to the -mm tree. Its filename is staging-lustre-libcfs-cleanup-linux-memh.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ 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 linux-next.patch staging-lustre-ldlm-convert-to-shrinkers-to-count-scan-api.patch staging-lustre-obdclass-convert-lu_object-shrinker-to-count-scan-api.patch staging-lustre-ptlrpc-convert-to-new-shrinker-api.patch staging-lustre-libcfs-cleanup-linux-memh.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