diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:29:23 (GMT) |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:29:23 (GMT) |
commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /fs/dquot.c | |
parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
download | linux-fsl-qoriq-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.tar.xz |
Merge branch 'master'
Diffstat (limited to 'fs/dquot.c')
-rw-r--r-- | fs/dquot.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -500,7 +500,7 @@ static void prune_dqcache(int count) * more memory */ -static int shrink_dqcache_memory(int nr, unsigned int gfp_mask) +static int shrink_dqcache_memory(int nr, gfp_t gfp_mask) { if (nr) { spin_lock(&dq_list_lock); |