diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /fs/dquot.c | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/dquot.c')
| -rw-r--r-- | fs/dquot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dquot.c b/fs/dquot.c index b9732335bcdc..05f3327d64a3 100644 --- a/fs/dquot.c +++ b/fs/dquot.c | |||
| @@ -500,7 +500,7 @@ static void prune_dqcache(int count) | |||
| 500 | * more memory | 500 | * more memory |
| 501 | */ | 501 | */ |
| 502 | 502 | ||
| 503 | static int shrink_dqcache_memory(int nr, unsigned int gfp_mask) | 503 | static int shrink_dqcache_memory(int nr, gfp_t gfp_mask) |
| 504 | { | 504 | { |
| 505 | if (nr) { | 505 | if (nr) { |
| 506 | spin_lock(&dq_list_lock); | 506 | spin_lock(&dq_list_lock); |