mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
[PATCH] zoned vm counters: conversion of nr_dirty to per zone counter
This makes nr_dirty a per zone counter. Looping over all processors is avoided during writeback state determination. The counter aggregation for nr_dirty had to be undone in the NFS layer since we summed up the page counts from multiple zones. Someone more familiar with NFS should probably review what I have done. [[email protected]: bugfix] Signed-off-by: Christoph Lameter <[email protected]> Cc: Trond Myklebust <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
df849a1529
commit
b1e7a8fd85
12 changed files with 16 additions and 17 deletions
|
|
@ -109,7 +109,7 @@ struct writeback_state
|
|||
|
||||
static void get_writeback_state(struct writeback_state *wbs)
|
||||
{
|
||||
wbs->nr_dirty = read_page_state(nr_dirty);
|
||||
wbs->nr_dirty = global_page_state(NR_FILE_DIRTY);
|
||||
wbs->nr_unstable = read_page_state(nr_unstable);
|
||||
wbs->nr_mapped = global_page_state(NR_FILE_MAPPED) +
|
||||
global_page_state(NR_ANON_PAGES);
|
||||
|
|
@ -641,7 +641,8 @@ int __set_page_dirty_nobuffers(struct page *page)
|
|||
if (mapping2) { /* Race with truncate? */
|
||||
BUG_ON(mapping2 != mapping);
|
||||
if (mapping_cap_account_dirty(mapping))
|
||||
inc_page_state(nr_dirty);
|
||||
__inc_zone_page_state(page,
|
||||
NR_FILE_DIRTY);
|
||||
radix_tree_tag_set(&mapping->page_tree,
|
||||
page_index(page), PAGECACHE_TAG_DIRTY);
|
||||
}
|
||||
|
|
@ -728,9 +729,9 @@ int test_clear_page_dirty(struct page *page)
|
|||
radix_tree_tag_clear(&mapping->page_tree,
|
||||
page_index(page),
|
||||
PAGECACHE_TAG_DIRTY);
|
||||
write_unlock_irqrestore(&mapping->tree_lock, flags);
|
||||
if (mapping_cap_account_dirty(mapping))
|
||||
dec_page_state(nr_dirty);
|
||||
__dec_zone_page_state(page, NR_FILE_DIRTY);
|
||||
write_unlock_irqrestore(&mapping->tree_lock, flags);
|
||||
return 1;
|
||||
}
|
||||
write_unlock_irqrestore(&mapping->tree_lock, flags);
|
||||
|
|
@ -761,7 +762,7 @@ int clear_page_dirty_for_io(struct page *page)
|
|||
if (mapping) {
|
||||
if (TestClearPageDirty(page)) {
|
||||
if (mapping_cap_account_dirty(mapping))
|
||||
dec_page_state(nr_dirty);
|
||||
dec_zone_page_state(page, NR_FILE_DIRTY);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue