diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2007-10-17 02:25:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:45 -0400 |
commit | c9e51e4180696aa67915ec5665e4ec74125565de (patch) | |
tree | d66e1427b16e56bc7da0dfb583a6d8edb55a2c3e /fs | |
parent | b2e8fb6efa209c82203c79b491b5bc952d44aa57 (diff) |
mm: count reclaimable pages per BDI
Count per BDI reclaimable pages; nr_reclaimable = nr_dirty + nr_unstable.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/buffer.c | 2 | ||||
-rw-r--r-- | fs/nfs/write.c | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index faceb5eecca9..86e58b1dcd9c 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -710,6 +710,8 @@ static int __set_page_dirty(struct page *page, | |||
710 | 710 | ||
711 | if (mapping_cap_account_dirty(mapping)) { | 711 | if (mapping_cap_account_dirty(mapping)) { |
712 | __inc_zone_page_state(page, NR_FILE_DIRTY); | 712 | __inc_zone_page_state(page, NR_FILE_DIRTY); |
713 | __inc_bdi_stat(mapping->backing_dev_info, | ||
714 | BDI_RECLAIMABLE); | ||
713 | task_io_account_write(PAGE_CACHE_SIZE); | 715 | task_io_account_write(PAGE_CACHE_SIZE); |
714 | } | 716 | } |
715 | radix_tree_tag_set(&mapping->page_tree, | 717 | radix_tree_tag_set(&mapping->page_tree, |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 82d7ee98c675..0cf9d1cd9bd2 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -447,6 +447,7 @@ nfs_mark_request_commit(struct nfs_page *req) | |||
447 | NFS_PAGE_TAG_COMMIT); | 447 | NFS_PAGE_TAG_COMMIT); |
448 | spin_unlock(&inode->i_lock); | 448 | spin_unlock(&inode->i_lock); |
449 | inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 449 | inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
450 | inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_RECLAIMABLE); | ||
450 | __mark_inode_dirty(inode, I_DIRTY_DATASYNC); | 451 | __mark_inode_dirty(inode, I_DIRTY_DATASYNC); |
451 | } | 452 | } |
452 | 453 | ||
@@ -533,6 +534,8 @@ static void nfs_cancel_commit_list(struct list_head *head) | |||
533 | while(!list_empty(head)) { | 534 | while(!list_empty(head)) { |
534 | req = nfs_list_entry(head->next); | 535 | req = nfs_list_entry(head->next); |
535 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 536 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
537 | dec_bdi_stat(req->wb_page->mapping->backing_dev_info, | ||
538 | BDI_RECLAIMABLE); | ||
536 | nfs_list_remove_request(req); | 539 | nfs_list_remove_request(req); |
537 | clear_bit(PG_NEED_COMMIT, &(req)->wb_flags); | 540 | clear_bit(PG_NEED_COMMIT, &(req)->wb_flags); |
538 | nfs_inode_remove_request(req); | 541 | nfs_inode_remove_request(req); |
@@ -1193,6 +1196,8 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how) | |||
1193 | nfs_list_remove_request(req); | 1196 | nfs_list_remove_request(req); |
1194 | nfs_mark_request_commit(req); | 1197 | nfs_mark_request_commit(req); |
1195 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 1198 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
1199 | dec_bdi_stat(req->wb_page->mapping->backing_dev_info, | ||
1200 | BDI_RECLAIMABLE); | ||
1196 | nfs_clear_page_tag_locked(req); | 1201 | nfs_clear_page_tag_locked(req); |
1197 | } | 1202 | } |
1198 | return -ENOMEM; | 1203 | return -ENOMEM; |
@@ -1218,6 +1223,8 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) | |||
1218 | nfs_list_remove_request(req); | 1223 | nfs_list_remove_request(req); |
1219 | clear_bit(PG_NEED_COMMIT, &(req)->wb_flags); | 1224 | clear_bit(PG_NEED_COMMIT, &(req)->wb_flags); |
1220 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); | 1225 | dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); |
1226 | dec_bdi_stat(req->wb_page->mapping->backing_dev_info, | ||
1227 | BDI_RECLAIMABLE); | ||
1221 | 1228 | ||
1222 | dprintk("NFS: commit (%s/%Ld %d@%Ld)", | 1229 | dprintk("NFS: commit (%s/%Ld %d@%Ld)", |
1223 | req->wb_context->path.dentry->d_inode->i_sb->s_id, | 1230 | req->wb_context->path.dentry->d_inode->i_sb->s_id, |