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/inode.c | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'fs/inode.c')
| -rw-r--r-- | fs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inode.c b/fs/inode.c index f80a79ff156b..7d3316527767 100644 --- a/fs/inode.c +++ b/fs/inode.c | |||
| @@ -475,7 +475,7 @@ static void prune_icache(int nr_to_scan) | |||
| 475 | * This function is passed the number of inodes to scan, and it returns the | 475 | * This function is passed the number of inodes to scan, and it returns the |
| 476 | * total number of remaining possibly-reclaimable inodes. | 476 | * total number of remaining possibly-reclaimable inodes. |
| 477 | */ | 477 | */ |
| 478 | static int shrink_icache_memory(int nr, unsigned int gfp_mask) | 478 | static int shrink_icache_memory(int nr, gfp_t gfp_mask) |
| 479 | { | 479 | { |
| 480 | if (nr) { | 480 | if (nr) { |
| 481 | /* | 481 | /* |