patch-2.2.0-pre6 linux/fs/buffer.c

• Lines: 45
• Date: Thu Jan 7 15:06:59 1999
• Orig file: v2.2.0-pre5/linux/fs/buffer.c
• Orig date: Thu Jan 7 15:11:38 1999

diff -u --recursive --new-file v2.2.0-pre5/linux/fs/buffer.c linux/fs/buffer.c
@@ -60,7 +60,7 @@
  */
 static unsigned long bh_hash_mask = 0;
 
-static int grow_buffers(int pri, int size);
+static int grow_buffers(int size);
 
 static struct buffer_head ** hash_table;
 static struct buffer_head * lru_list[NR_LIST] = {NULL, };
@@ -689,7 +689,7 @@
  */
 static void refill_freelist(int size)
 {
-	if (!grow_buffers(GFP_KERNEL, size)) {
+	if (!grow_buffers(size)) {
 		wakeup_bdflush(1);
 		current->policy |= SCHED_YIELD;
 		schedule();
@@ -1396,7 +1396,7 @@
  * Try to increase the number of buffers available: the size argument
  * is used to determine what kind of buffers we want.
  */
-static int grow_buffers(int pri, int size)
+static int grow_buffers(int size)
 {
 	unsigned long page;
 	struct buffer_head *bh, *tmp;
@@ -1408,7 +1408,7 @@
 		return 0;
 	}
 
-	if (!(page = __get_free_page(pri)))
+	if (!(page = __get_free_page(GFP_BUFFER)))
 		return 0;
 	bh = create_buffers(page, size, 0);
 	if (!bh) {
@@ -1571,7 +1571,7 @@
 	}
 
 	lru_list[BUF_CLEAN] = 0;
-	grow_buffers(GFP_KERNEL, BLOCK_SIZE);
+	grow_buffers(BLOCK_SIZE);
 }