diff options
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 9 | 
1 files changed, 7 insertions, 2 deletions
| diff --git a/fs/dcache.c b/fs/dcache.c index 22a0ef41bad..37f72ee5bf7 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -35,6 +35,7 @@  #include <linux/hardirq.h>  #include <linux/bit_spinlock.h>  #include <linux/rculist_bl.h> +#include <linux/prefetch.h>  #include "internal.h"  /* @@ -1219,7 +1220,7 @@ void shrink_dcache_parent(struct dentry * parent)  EXPORT_SYMBOL(shrink_dcache_parent);  /* - * Scan `nr' dentries and return the number which remain. + * Scan `sc->nr_slab_to_reclaim' dentries and return the number which remain.   *   * We need to avoid reentering the filesystem if the caller is performing a   * GFP_NOFS allocation attempt.  One example deadlock is: @@ -1230,8 +1231,12 @@ EXPORT_SYMBOL(shrink_dcache_parent);   *   * In this case we return -1 to tell the caller that we baled.   */ -static int shrink_dcache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask) +static int shrink_dcache_memory(struct shrinker *shrink, +				struct shrink_control *sc)  { +	int nr = sc->nr_to_scan; +	gfp_t gfp_mask = sc->gfp_mask; +  	if (nr) {  		if (!(gfp_mask & __GFP_FS))  			return -1; | 
