From: Andrew Morton Cc: Christoph Lameter Signed-off-by: Andrew Morton --- fs/nfs/pagelist.c | 1 - fs/nfs/write.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff -puN fs/nfs/pagelist.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-nfs-fix fs/nfs/pagelist.c --- 25/fs/nfs/pagelist.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-nfs-fix Tue Jun 27 15:23:00 2006 +++ 25-akpm/fs/nfs/pagelist.c Tue Jun 27 15:23:00 2006 @@ -154,7 +154,6 @@ void nfs_clear_request(struct nfs_page * { struct page *page = req->wb_page; if (page != NULL) { - dec_zone_page_state(page, NR_UNSTABLE_NFS); page_cache_release(page); req->wb_page = NULL; } diff -puN fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-nfs-fix fs/nfs/write.c --- 25/fs/nfs/write.c~zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter-nfs-fix Tue Jun 27 15:23:00 2006 +++ 25-akpm/fs/nfs/write.c Tue Jun 27 15:23:00 2006 @@ -1404,6 +1404,7 @@ static void nfs_commit_done(struct rpc_t while (!list_empty(&data->pages)) { req = nfs_list_entry(data->pages.next); nfs_list_remove_request(req); + dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); dprintk("NFS: commit (%s/%Ld %d@%Ld)", req->wb_context->dentry->d_inode->i_sb->s_id, @@ -1429,8 +1430,6 @@ static void nfs_commit_done(struct rpc_t dprintk(" mismatch\n"); nfs_mark_request_dirty(req); next: - if (req->wb_page) - dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS); nfs_clear_page_writeback(req); } } _