diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-30 00:49:18 -0400 |
| commit | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (patch) | |
| tree | c40fd8818c64c5d7d1d90afab0bd6ffd94505526 /fs/buffer.c | |
| parent | 9bd481f85940726bf66aae5cd03c5b912ad0ae4c (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 4 |
1 files changed, 2 insertions, 2 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 | */ |
| 279 | static void do_sync(unsigned long wait) | 279 | static 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) { |