Clean up and export cancel_dirty_page() to modules (8368e328) · Commits · 戴 / test

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:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

mm/truncate.c

+8 −4

Original line number	Diff line number	Diff line
		@@ -60,12 +60,16 @@ void cancel_dirty_page(struct page *page, unsigned int account_size)
		WARN_ON(++warncount < 5);
		}

		if (TestClearPageDirty(page) && account_size &&
		mapping_cap_account_dirty(page->mapping)) {
		if (TestClearPageDirty(page)) {
		struct address_space *mapping = page->mapping;
		if (mapping && mapping_cap_account_dirty(mapping)) {
		dec_zone_page_state(page, NR_FILE_DIRTY);
		if (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

Admin message