aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPekka J Enberg <penberg@cs.Helsinki.FI>2005-06-28 23:44:55 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 00:20:31 -0400
commit687a21cee17000177b1935896b9b475acf136678 (patch)
tree41e59684ae6479e84b34edc46972ce32c2cc58b7
parent05133fc498e788e1c1ca4e906f9e05d9779fd63b (diff)
[PATCH] rename wakeup_bdflush to wakeup_pdflush
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--fs/buffer.c4
-rw-r--r--include/linux/writeback.h2
-rw-r--r--mm/page-writeback.c2
-rw-r--r--mm/vmscan.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/buffer.c b/fs/buffer.c
index 13e5938a64f6..561e63a14966 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -278,7 +278,7 @@ EXPORT_SYMBOL(thaw_bdev);
278 */ 278 */
279static void do_sync(unsigned long wait) 279static void do_sync(unsigned long wait)
280{ 280{
281 wakeup_bdflush(0); 281 wakeup_pdflush(0);
282 sync_inodes(0); /* All mappings, inodes and their blockdevs */ 282 sync_inodes(0); /* All mappings, inodes and their blockdevs */
283 DQUOT_SYNC(NULL); 283 DQUOT_SYNC(NULL);
284 sync_supers(); /* Write the superblocks */ 284 sync_supers(); /* Write the superblocks */
@@ -497,7 +497,7 @@ static void free_more_memory(void)
497 struct zone **zones; 497 struct zone **zones;
498 pg_data_t *pgdat; 498 pg_data_t *pgdat;
499 499
500 wakeup_bdflush(1024); 500 wakeup_pdflush(1024);
501 yield(); 501 yield();
502 502
503 for_each_pgdat(pgdat) { 503 for_each_pgdat(pgdat) {
diff --git a/include/linux/writeback.h b/include/linux/writeback.h
index d5c3fe1bf33d..542dbaee6512 100644
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
@@ -85,7 +85,7 @@ static inline void wait_on_inode(struct inode *inode)
85/* 85/*
86 * mm/page-writeback.c 86 * mm/page-writeback.c
87 */ 87 */
88int wakeup_bdflush(long nr_pages); 88int wakeup_pdflush(long nr_pages);
89void laptop_io_completion(void); 89void laptop_io_completion(void);
90void laptop_sync_completion(void); 90void laptop_sync_completion(void);
91void throttle_vm_writeout(void); 91void throttle_vm_writeout(void);
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 613b99a55917..a6329fa8f862 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -354,7 +354,7 @@ static void background_writeout(unsigned long _min_pages)
354 * the whole world. Returns 0 if a pdflush thread was dispatched. Returns 354 * the whole world. Returns 0 if a pdflush thread was dispatched. Returns
355 * -1 if all pdflush threads were busy. 355 * -1 if all pdflush threads were busy.
356 */ 356 */
357int wakeup_bdflush(long nr_pages) 357int wakeup_pdflush(long nr_pages)
358{ 358{
359 if (nr_pages == 0) { 359 if (nr_pages == 0) {
360 struct writeback_state wbs; 360 struct writeback_state wbs;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 1fa312a8db77..cfffe5098d53 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -972,7 +972,7 @@ int try_to_free_pages(struct zone **zones, unsigned int gfp_mask)
972 * writeout. So in laptop mode, write out the whole world. 972 * writeout. So in laptop mode, write out the whole world.
973 */ 973 */
974 if (total_scanned > sc.swap_cluster_max + sc.swap_cluster_max/2) { 974 if (total_scanned > sc.swap_cluster_max + sc.swap_cluster_max/2) {
975 wakeup_bdflush(laptop_mode ? 0 : total_scanned); 975 wakeup_pdflush(laptop_mode ? 0 : total_scanned);
976 sc.may_writepage = 1; 976 sc.may_writepage = 1;
977 } 977 }
978 978