Commit 8368e328 authored by Linus Torvalds's avatar Linus Torvalds

Clean up and export cancel_dirty_page() to modules

Make cancel_dirty_page() act more like all the other dirty and writeback
accounting functions: test for "mapping" being NULL, and do the
NR_FILE_DIRY accounting purely based on mapping_cap_account_dirty()).

Also, add it to the exports, so that modular filesystems can use it.
Acked-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 18ed1c05
...@@ -60,12 +60,16 @@ void cancel_dirty_page(struct page *page, unsigned int account_size) ...@@ -60,12 +60,16 @@ void cancel_dirty_page(struct page *page, unsigned int account_size)
WARN_ON(++warncount < 5); WARN_ON(++warncount < 5);
} }
if (TestClearPageDirty(page) && account_size && if (TestClearPageDirty(page)) {
mapping_cap_account_dirty(page->mapping)) { struct address_space *mapping = page->mapping;
if (mapping && mapping_cap_account_dirty(mapping)) {
dec_zone_page_state(page, NR_FILE_DIRTY); dec_zone_page_state(page, NR_FILE_DIRTY);
if (account_size)
task_io_account_cancelled_write(account_size); task_io_account_cancelled_write(account_size);
} }
}
} }
EXPORT_SYMBOL(cancel_dirty_page);
/* /*
* If truncate cannot remove the fs-private metadata from the page, the page * If truncate cannot remove the fs-private metadata from the page, the page
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment