diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:22:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 18:22:57 -0500 |
| commit | 47853e7fa588bef826c9799a87b33904b32bd905 (patch) | |
| tree | bd7681d1aedf28125b86fb0218e64297f4d71ac9 /mm | |
| parent | 221fc10ec89834329e5613e3cab4569ba22da410 (diff) | |
| parent | 9e56904e41e242169007e69d9916059dab995d90 (diff) | |
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/page-writeback.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 0166ea15c9..5240e426c1 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
| @@ -550,11 +550,17 @@ void __init page_writeback_init(void) | |||
| 550 | 550 | ||
| 551 | int do_writepages(struct address_space *mapping, struct writeback_control *wbc) | 551 | int do_writepages(struct address_space *mapping, struct writeback_control *wbc) |
| 552 | { | 552 | { |
| 553 | int ret; | ||
| 554 | |||
| 553 | if (wbc->nr_to_write <= 0) | 555 | if (wbc->nr_to_write <= 0) |
| 554 | return 0; | 556 | return 0; |
| 557 | wbc->for_writepages = 1; | ||
| 555 | if (mapping->a_ops->writepages) | 558 | if (mapping->a_ops->writepages) |
| 556 | return mapping->a_ops->writepages(mapping, wbc); | 559 | ret = mapping->a_ops->writepages(mapping, wbc); |
| 557 | return generic_writepages(mapping, wbc); | 560 | else |
| 561 | ret = generic_writepages(mapping, wbc); | ||
| 562 | wbc->for_writepages = 0; | ||
| 563 | return ret; | ||
| 558 | } | 564 | } |
| 559 | 565 | ||
| 560 | /** | 566 | /** |