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

Commit c9e51e41 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

mm: count reclaimable pages per BDI 



Count per BDI reclaimable pages; nr_reclaimable = nr_dirty + nr_unstable.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b2e8fb6e

fs/buffer.c

+2 −0
Original line number Diff line number Diff line
@@ -710,6 +710,8 @@ static int __set_page_dirty(struct page *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_io_account_write(PAGE_CACHE_SIZE);

		}

		radix_tree_tag_set(&mapping->page_tree,

fs/nfs/write.c

+7 −0
Original line number Diff line number Diff line
@@ -447,6 +447,7 @@ nfs_mark_request_commit(struct nfs_page *req) 
			NFS_PAGE_TAG_COMMIT);

	spin_unlock(&inode->i_lock);

	inc_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

	inc_bdi_stat(req->wb_page->mapping->backing_dev_info, BDI_RECLAIMABLE);

	__mark_inode_dirty(inode, I_DIRTY_DATASYNC);

}
@@ -533,6 +534,8 @@ static void nfs_cancel_commit_list(struct list_head *head) 
	while(!list_empty(head)) {

		req = nfs_list_entry(head->next);

		dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		dec_bdi_stat(req->wb_page->mapping->backing_dev_info,

				BDI_RECLAIMABLE);

		nfs_list_remove_request(req);

		clear_bit(PG_NEED_COMMIT, &(req)->wb_flags);

		nfs_inode_remove_request(req);
@@ -1193,6 +1196,8 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how) 
		nfs_list_remove_request(req);

		nfs_mark_request_commit(req);

		dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		dec_bdi_stat(req->wb_page->mapping->backing_dev_info,

				BDI_RECLAIMABLE);

		nfs_clear_page_tag_locked(req);

	}

	return -ENOMEM;
@@ -1218,6 +1223,8 @@ static void nfs_commit_done(struct rpc_task *task, void *calldata) 
		nfs_list_remove_request(req);

		clear_bit(PG_NEED_COMMIT, &(req)->wb_flags);

		dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);

		dec_bdi_stat(req->wb_page->mapping->backing_dev_info,

				BDI_RECLAIMABLE);



		dprintk("NFS: commit (%s/%Ld %d@%Ld)",

			req->wb_context->path.dentry->d_inode->i_sb->s_id,

include/linux/backing-dev.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ enum bdi_state { 
typedef int (congested_fn)(void *, int);



enum bdi_stat_item {

	BDI_RECLAIMABLE,

	NR_BDI_STAT_ITEMS

};

mm/page-writeback.c

+4 −0
Original line number Diff line number Diff line
@@ -827,6 +827,8 @@ int __set_page_dirty_nobuffers(struct page *page) 
			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_io_account_write(PAGE_CACHE_SIZE);

			}

			radix_tree_tag_set(&mapping->page_tree,
@@ -961,6 +963,8 @@ int clear_page_dirty_for_io(struct page *page) 
		 */

		if (TestClearPageDirty(page)) {

			dec_zone_page_state(page, NR_FILE_DIRTY);

			dec_bdi_stat(mapping->backing_dev_info,

					BDI_RECLAIMABLE);

			return 1;

		}

		return 0;

mm/truncate.c

+2 −0
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ void cancel_dirty_page(struct page *page, unsigned int account_size) 
		struct address_space *mapping = page->mapping;

		if (mapping && mapping_cap_account_dirty(mapping)) {

			dec_zone_page_state(page, NR_FILE_DIRTY);

			dec_bdi_stat(mapping->backing_dev_info,

					BDI_RECLAIMABLE);

			if (account_size)

				task_io_account_cancelled_write(account_size);

		}