lkml.org 
[lkml]   [2007]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 09/15] 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>
    ---
    fs/buffer.c | 2 ++
    fs/nfs/write.c | 7 +++++++
    include/linux/backing-dev.h | 1 +
    mm/page-writeback.c | 4 ++++
    mm/truncate.c | 2 ++
    5 files changed, 16 insertions(+)

    Index: linux-2.6/fs/buffer.c
    ===================================================================
    --- linux-2.6.orig/fs/buffer.c 2007-04-24 21:18:29.000000000 +0200
    +++ linux-2.6/fs/buffer.c 2007-04-25 08:20:10.000000000 +0200
    @@ -734,6 +734,8 @@ int __set_page_dirty_buffers(struct page
    if (page->mapping) { /* Race with truncate? */
    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,
    Index: linux-2.6/mm/page-writeback.c
    ===================================================================
    --- linux-2.6.orig/mm/page-writeback.c 2007-04-24 21:18:30.000000000 +0200
    +++ linux-2.6/mm/page-writeback.c 2007-04-25 08:20:10.000000000 +0200
    @@ -828,6 +828,8 @@ int __set_page_dirty_nobuffers(struct pa
    BUG_ON(mapping2 != 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_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
    */
    if (TestClearPageDirty(page)) {
    dec_zone_page_state(page, NR_FILE_DIRTY);
    + dec_bdi_stat(mapping->backing_dev_info,
    + BDI_RECLAIMABLE);
    return 1;
    }
    return 0;
    Index: linux-2.6/mm/truncate.c
    ===================================================================
    --- linux-2.6.orig/mm/truncate.c 2007-04-24 21:18:30.000000000 +0200
    +++ linux-2.6/mm/truncate.c 2007-04-25 08:20:10.000000000 +0200
    @@ -72,6 +72,8 @@ void cancel_dirty_page(struct page *page
    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);
    }
    Index: linux-2.6/fs/nfs/write.c
    ===================================================================
    --- linux-2.6.orig/fs/nfs/write.c 2007-04-25 08:17:04.000000000 +0200
    +++ linux-2.6/fs/nfs/write.c 2007-04-25 08:20:29.000000000 +0200
    @@ -454,6 +454,7 @@ nfs_mark_request_commit(struct nfs_page
    set_bit(PG_NEED_COMMIT, &(req)->wb_flags);
    spin_unlock(&nfsi->req_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);
    }

    @@ -552,6 +553,8 @@ static void nfs_cancel_commit_list(struc
    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);
    @@ -1269,6 +1272,8 @@ nfs_commit_list(struct inode *inode, str
    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_writeback(req);
    }
    return -ENOMEM;
    @@ -1294,6 +1299,8 @@ static void nfs_commit_done(struct rpc_t
    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->dentry->d_inode->i_sb->s_id,
    Index: linux-2.6/include/linux/backing-dev.h
    ===================================================================
    --- linux-2.6.orig/include/linux/backing-dev.h 2007-04-25 08:20:03.000000000 +0200
    +++ linux-2.6/include/linux/backing-dev.h 2007-04-25 08:20:10.000000000 +0200
    @@ -27,6 +27,7 @@ enum bdi_state {
    typedef int (congested_fn)(void *, int);

    enum bdi_stat_item {
    + BDI_RECLAIMABLE,
    NR_BDI_STAT_ITEMS
    };

    --

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-05-10 12:19    [W:0.030 / U:0.084 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site