summaryrefslogtreecommitdiff
path: root/fs/dquot.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-28 16:29:23 (GMT)
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 16:29:23 (GMT)
commit7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch)
tree9116e5bde860d00685c5b6eee7be5ba9899aabb9 /fs/dquot.c
parent972c26bdd6b58e7534473c4f7928584578cf43f4 (diff)
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff)
downloadlinux-fsl-qoriq-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.tar.xz
Merge branch 'master'
Diffstat (limited to 'fs/dquot.c')
-rw-r--r--fs/dquot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dquot.c b/fs/dquot.c
index b973233..05f3327 100644
--- a/fs/dquot.c
+++ b/fs/dquot.c
@@ -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);