diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /fs/buffer.c | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 103caefa3..3ca874e37 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -24,18 +24,11 @@ * - RMK */ -#include <linux/sched.h> -#include <linux/kernel.h> -#include <linux/major.h> -#include <linux/string.h> +#include <linux/malloc.h> #include <linux/locks.h> #include <linux/errno.h> -#include <linux/malloc.h> -#include <linux/slab.h> -#include <linux/pagemap.h> #include <linux/swap.h> #include <linux/swapctl.h> -#include <linux/smp.h> #include <linux/smp_lock.h> #include <linux/vmalloc.h> #include <linux/blkdev.h> @@ -44,7 +37,6 @@ #include <linux/init.h> #include <linux/quotaops.h> -#include <asm/system.h> #include <asm/uaccess.h> #include <asm/io.h> #include <asm/bitops.h> @@ -734,7 +726,7 @@ static void refill_freelist(int size) needed = bdf_prm.b_un.nrefill * size; while ((nr_free_pages > freepages.min*2) && - (buffermem >> PAGE_SHIFT) * 100 < (buffer_mem.max_percent * num_physpages) && + !buffer_over_max() && grow_buffers(GFP_BUFFER, size)) { obtained += PAGE_SIZE; if (obtained >= needed) |