Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3a7cca1 authored by Edward Shishkin's avatar Edward Shishkin Committed by Linus Torvalds
Browse files

vfs: add/use account_page_dirtied() 



Add a helper function account_page_dirtied().  Use that from two
callsites.  reiser4 adds a function which adds a third callsite.

Signed-off-by: default avatarEdward <Shishkin&lt;edward.shishkin@gmail.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bd2f6199

fs/buffer.c

+1 −8
Original line number Diff line number Diff line
@@ -621,14 +621,7 @@ static void __set_page_dirty(struct page *page, 
	spin_lock_irq(&mapping->tree_lock);

	if (page->mapping) {	/* Race with truncate? */

		WARN_ON_ONCE(warn && !PageUptodate(page));



		if (mapping_cap_account_dirty(mapping)) {

			__inc_zone_page_state(page, NR_FILE_DIRTY);

			__inc_bdi_stat(mapping->backing_dev_info,

					BDI_RECLAIMABLE);

			task_dirty_inc(current);

			task_io_account_write(PAGE_CACHE_SIZE);

		}

		account_page_dirtied(page, mapping);

		radix_tree_tag_set(&mapping->page_tree,

				page_index(page), PAGECACHE_TAG_DIRTY);

	}

include/linux/mm.h

+1 −0
Original line number Diff line number Diff line
@@ -834,6 +834,7 @@ int __set_page_dirty_nobuffers(struct page *page); 
int __set_page_dirty_no_writeback(struct page *page);

int redirty_page_for_writepage(struct writeback_control *wbc,

				struct page *page);

void account_page_dirtied(struct page *page, struct address_space *mapping);

int set_page_dirty(struct page *page);

int set_page_dirty_lock(struct page *page);

int clear_page_dirty_for_io(struct page *page);

mm/page-writeback.c

+15 −7
Original line number Diff line number Diff line
@@ -1197,6 +1197,20 @@ int __set_page_dirty_no_writeback(struct page *page) 
	return 0;

}



/*

 * Helper function for set_page_dirty family.

 * NOTE: This relies on being atomic wrt interrupts.

 */

void account_page_dirtied(struct page *page, struct address_space *mapping)

{

	if (mapping_cap_account_dirty(mapping)) {

		__inc_zone_page_state(page, NR_FILE_DIRTY);

		__inc_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);

		task_dirty_inc(current);

		task_io_account_write(PAGE_CACHE_SIZE);

	}

}



/*

 * For address_spaces which do not use buffers.  Just tag the page as dirty in

 * its radix tree.
@@ -1226,13 +1240,7 @@ int __set_page_dirty_nobuffers(struct page *page) 
		if (mapping2) { /* Race with truncate? */

			BUG_ON(mapping2 != mapping);

			WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page));

			if (mapping_cap_account_dirty(mapping)) {

				__inc_zone_page_state(page, NR_FILE_DIRTY);

				__inc_bdi_stat(mapping->backing_dev_info,

						BDI_RECLAIMABLE);

				task_dirty_inc(current);

				task_io_account_write(PAGE_CACHE_SIZE);

			}

			account_page_dirtied(page, mapping);

			radix_tree_tag_set(&mapping->page_tree,

				page_index(page), PAGECACHE_TAG_DIRTY);

		}