summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-05 00:36:09 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-12-06 10:46:41 -0500
commit3925675cb37cc9c3fd1d3f56ce0fa729f995f863 (patch)
tree9e4ab16c91ab7d679246ade359a00803665ba391 /fs/nfs
parente507d9ebbb2d5db5948a6fb3c33f015d60708d19 (diff)
downloadop-kernel-dev-3925675cb37cc9c3fd1d3f56ce0fa729f995f863.zip
op-kernel-dev-3925675cb37cc9c3fd1d3f56ce0fa729f995f863.tar.gz
NFS: Fix up the dirty page accounting
There is now no reason to account for the dirty pages in the NFS code, since the VM code will now do it for us via __set_page_dirty_nobuffers(), and set_page_writeback(). We still need to keep the accounting of stable writes, though. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/pagelist.c1
-rw-r--r--fs/nfs/write.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index e046c9b..47ae2b4d 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -331,7 +331,6 @@ long nfs_scan_dirty(struct address_space *mapping,
nfsi->ndirty--;
nfs_list_remove_request(req);
nfs_list_add_request(req, dst);
- dec_zone_page_state(req->wb_page, NR_FILE_DIRTY);
res++;
if (res == LONG_MAX)
goto out;
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index a4c9df6..9624aec 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -440,7 +440,6 @@ nfs_mark_request_dirty(struct nfs_page *req)
nfs_list_add_request(req, &nfsi->dirty);
nfsi->ndirty++;
spin_unlock(&nfsi->req_lock);
- inc_zone_page_state(req->wb_page, NR_FILE_DIRTY);
mark_inode_dirty(inode);
}
OpenPOWER on IntegriCloud