From dfe753ebe1d3933f704e332439650f55fdee3aaf Mon Sep 17 00:00:00 2001
From: Pekka J Enberg <penberg@cs.Helsinki.FI>
Date: Tue, 28 Jun 2005 20:44:55 -0700
Subject: [PATCH] --- yaml --- r: 3884 b: refs/heads/master c:
 687a21cee17000177b1935896b9b475acf136678 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/fs/buffer.c               | 4 ++--
 trunk/include/linux/writeback.h | 2 +-
 trunk/mm/page-writeback.c       | 2 +-
 trunk/mm/vmscan.c               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f915ca976b17..0bef285b0c8c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 05133fc498e788e1c1ca4e906f9e05d9779fd63b
+refs/heads/master: 687a21cee17000177b1935896b9b475acf136678
diff --git a/trunk/fs/buffer.c b/trunk/fs/buffer.c
index 13e5938a64f6..561e63a14966 100644
--- a/trunk/fs/buffer.c
+++ b/trunk/fs/buffer.c
@@ -278,7 +278,7 @@ EXPORT_SYMBOL(thaw_bdev);
  */
 static void do_sync(unsigned long wait)
 {
-	wakeup_bdflush(0);
+	wakeup_pdflush(0);
 	sync_inodes(0);		/* All mappings, inodes and their blockdevs */
 	DQUOT_SYNC(NULL);
 	sync_supers();		/* Write the superblocks */
@@ -497,7 +497,7 @@ static void free_more_memory(void)
 	struct zone **zones;
 	pg_data_t *pgdat;
 
-	wakeup_bdflush(1024);
+	wakeup_pdflush(1024);
 	yield();
 
 	for_each_pgdat(pgdat) {
diff --git a/trunk/include/linux/writeback.h b/trunk/include/linux/writeback.h
index d5c3fe1bf33d..542dbaee6512 100644
--- a/trunk/include/linux/writeback.h
+++ b/trunk/include/linux/writeback.h
@@ -85,7 +85,7 @@ static inline void wait_on_inode(struct inode *inode)
 /*
  * mm/page-writeback.c
  */
-int wakeup_bdflush(long nr_pages);
+int wakeup_pdflush(long nr_pages);
 void laptop_io_completion(void);
 void laptop_sync_completion(void);
 void throttle_vm_writeout(void);
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index 613b99a55917..a6329fa8f862 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -354,7 +354,7 @@ static void background_writeout(unsigned long _min_pages)
  * the whole world.  Returns 0 if a pdflush thread was dispatched.  Returns
  * -1 if all pdflush threads were busy.
  */
-int wakeup_bdflush(long nr_pages)
+int wakeup_pdflush(long nr_pages)
 {
 	if (nr_pages == 0) {
 		struct writeback_state wbs;
diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c
index 1fa312a8db77..cfffe5098d53 100644
--- a/trunk/mm/vmscan.c
+++ b/trunk/mm/vmscan.c
@@ -972,7 +972,7 @@ int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
 		 * writeout.  So in laptop mode, write out the whole world.
 		 */
 		if (total_scanned > sc.swap_cluster_max + sc.swap_cluster_max/2) {
-			wakeup_bdflush(laptop_mode ? 0 : total_scanned);
+			wakeup_pdflush(laptop_mode ? 0 : total_scanned);
 			sc.may_writepage = 1;
 		}