aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/inode.c9
-rw-r--r--fs/ncpfs/mmap.c2
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/inode.c b/fs/inode.c
index f42961eb983b..14a6c4147e4e 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -452,15 +452,14 @@ static void prune_icache(int nr_to_scan)
452 nr_pruned++; 452 nr_pruned++;
453 } 453 }
454 inodes_stat.nr_unused -= nr_pruned; 454 inodes_stat.nr_unused -= nr_pruned;
455 if (current_is_kswapd())
456 __count_vm_events(KSWAPD_INODESTEAL, reap);
457 else
458 __count_vm_events(PGINODESTEAL, reap);
455 spin_unlock(&inode_lock); 459 spin_unlock(&inode_lock);
456 460
457 dispose_list(&freeable); 461 dispose_list(&freeable);
458 mutex_unlock(&iprune_mutex); 462 mutex_unlock(&iprune_mutex);
459
460 if (current_is_kswapd())
461 mod_page_state(kswapd_inodesteal, reap);
462 else
463 mod_page_state(pginodesteal, reap);
464} 463}
465 464
466/* 465/*
diff --git a/fs/ncpfs/mmap.c b/fs/ncpfs/mmap.c
index 52d60c3d8996..e7d5a3097fe6 100644
--- a/fs/ncpfs/mmap.c
+++ b/fs/ncpfs/mmap.c
@@ -93,7 +93,7 @@ static struct page* ncp_file_mmap_nopage(struct vm_area_struct *area,
93 */ 93 */
94 if (type) 94 if (type)
95 *type = VM_FAULT_MAJOR; 95 *type = VM_FAULT_MAJOR;
96 inc_page_state(pgmajfault); 96 count_vm_event(PGMAJFAULT);
97 return page; 97 return page;
98} 98}
99 99