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/quota/dquot.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/quota/dquot.c')
| -rw-r--r-- | fs/quota/dquot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 12c233da1b6b..437d2ca2de97 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c | |||
| @@ -676,7 +676,7 @@ static void prune_dqcache(int count) | |||
| 676 | * This is called from kswapd when we think we need some | 676 | * This is called from kswapd when we think we need some |
| 677 | * more memory | 677 | * more memory |
| 678 | */ | 678 | */ |
| 679 | static int shrink_dqcache_memory(int nr, gfp_t gfp_mask) | 679 | static int shrink_dqcache_memory(struct shrinker *shrink, int nr, gfp_t gfp_mask) |
| 680 | { | 680 | { |
| 681 | if (nr) { | 681 | if (nr) { |
| 682 | spin_lock(&dq_list_lock); | 682 | spin_lock(&dq_list_lock); |