diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 23:18:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-19 23:18:24 -0400 |
| commit | 620d0be88188cd3dc79db3f5eab1420d6f97c70c (patch) | |
| tree | 99dc63926b972288b176be6ed3663e6390289ce5 /fs/dcache.c | |
| parent | ee1039307a8a64b038f9b8cdc6f9120ecd9dfe9b (diff) | |
| parent | 16fd5367370099b59d96e30bb7d9de8d419659f2 (diff) | |
Merge branch 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev
* 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/xfsdev:
xfs: track AGs with reclaimable inodes in per-ag radix tree
xfs: convert inode shrinker to per-filesystem contexts
mm: add context argument to shrinker callback
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index c8c78ba0782..86d4db15473 100644 --- a/fs/dcache.c +++ b/fs/dcache.c | |||
| @@ -896,7 +896,7 @@ EXPORT_SYMBOL(shrink_dcache_parent); | |||
| 896 | * | 896 | * |
| 897 | * In this case we return -1 to tell the caller that we baled. | 897 | * In this case we return -1 to tell the caller that we baled. |
| 898 | */ | 898 | */ |
| 899 | static int shrink_dcache_memory(int nr, gfp_t gfp_mask) | 899 | static int shrink_dcache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask) |
| 900 | { | 900 | { |
| 901 | if (nr) { | 901 | if (nr) { |
| 902 | if (!(gfp_mask & __GFP_FS)) | 902 | if (!(gfp_mask & __GFP_FS)) |