Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3260f78a authored by Andrew Morton's avatar Andrew Morton Committed by Tim Shimmin
Browse files

[XFS] Use generic shrinker interfaces in XFS. 



SGI-PV: 964986
SGI-Modid: xfs-linux-melb:xfs-kern:28642a

Signed-Off-By: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid Chinner <dgc@sgi.com>
Signed-off-by: default avatarTim Shimmin <tes@sgi.com>
parent 92dfe8d2

fs/xfs/linux-2.6/kmem.h

+0 −19
Original line number Diff line number Diff line
@@ -100,25 +100,6 @@ kmem_zone_destroy(kmem_zone_t *zone) 
extern void *kmem_zone_alloc(kmem_zone_t *, unsigned int __nocast);

extern void *kmem_zone_zalloc(kmem_zone_t *, unsigned int __nocast);



/*

 * Low memory cache shrinkers

 */



typedef struct shrinker *kmem_shaker_t;

typedef int (*kmem_shake_func_t)(int, gfp_t);



static inline kmem_shaker_t

kmem_shake_register(kmem_shake_func_t sfunc)

{

	return set_shrinker(DEFAULT_SEEKS, sfunc);

}



static inline void

kmem_shake_deregister(kmem_shaker_t shrinker)

{

	remove_shrinker(shrinker);

}



static inline int

kmem_shake_allow(gfp_t gfp_mask)

{

fs/xfs/linux-2.6/xfs_buf.c

+3 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include <linux/freezer.h>



static kmem_zone_t *xfs_buf_zone;

static kmem_shaker_t xfs_buf_shake;

static struct shrinker *xfs_buf_shake;

STATIC int xfsbufd(void *);

STATIC int xfsbufd_wakeup(int, gfp_t);

STATIC void xfs_buf_delwri_queue(xfs_buf_t *, int);
@@ -1831,7 +1831,7 @@ xfs_buf_init(void) 
	if (!xfsdatad_workqueue)

		goto out_destroy_xfslogd_workqueue;



	xfs_buf_shake = kmem_shake_register(xfsbufd_wakeup);

	xfs_buf_shake = set_shrinker(DEFAULT_SEEKS, xfsbufd_wakeup);

	if (!xfs_buf_shake)

		goto out_destroy_xfsdatad_workqueue;
@@ -1853,7 +1853,7 @@ xfs_buf_init(void) 
void

xfs_buf_terminate(void)

{

	kmem_shake_deregister(xfs_buf_shake);

	remove_shrinker(xfs_buf_shake);

	destroy_workqueue(xfsdatad_workqueue);

	destroy_workqueue(xfslogd_workqueue);

	kmem_zone_destroy(xfs_buf_zone);

fs/xfs/quota/xfs_qm.c

+3 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ uint ndquot; 


kmem_zone_t	*qm_dqzone;

kmem_zone_t	*qm_dqtrxzone;

static kmem_shaker_t	xfs_qm_shaker;

static struct shrinker *xfs_qm_shaker;



static cred_t	xfs_zerocr;

static xfs_inode_t	xfs_zeroino;
@@ -150,7 +150,7 @@ xfs_Gqm_init(void) 
	} else

		xqm->qm_dqzone = qm_dqzone;



	xfs_qm_shaker = kmem_shake_register(xfs_qm_shake);

	xfs_qm_shaker = set_shrinker(DEFAULT_SEEKS, xfs_qm_shake);



	/*

	 * The t_dqinfo portion of transactions.
@@ -182,7 +182,7 @@ xfs_qm_destroy( 


	ASSERT(xqm != NULL);

	ASSERT(xqm->qm_nrefs == 0);

	kmem_shake_deregister(xfs_qm_shaker);

	remove_shrinker(xfs_qm_shaker);

	hsize = xqm->qm_dqhashmask + 1;

	for (i = 0; i < hsize; i++) {

		xfs_qm_list_destroy(&(xqm->qm_usr_dqhtable[i]));