diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-05 00:36:09 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-06 10:46:41 -0500 |
commit | 3925675cb37cc9c3fd1d3f56ce0fa729f995f863 (patch) | |
tree | 9e4ab16c91ab7d679246ade359a00803665ba391 /fs/nfs | |
parent | e507d9ebbb2d5db5948a6fb3c33f015d60708d19 (diff) |
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.c | 1 | ||||
-rw-r--r-- | fs/nfs/write.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index e046c9b6a9..47ae2b4dd1 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -331,7 +331,6 @@ long nfs_scan_dirty(struct address_space *mapping, | |||
331 | nfsi->ndirty--; | 331 | nfsi->ndirty--; |
332 | nfs_list_remove_request(req); | 332 | nfs_list_remove_request(req); |
333 | nfs_list_add_request(req, dst); | 333 | nfs_list_add_request(req, dst); |
334 | dec_zone_page_state(req->wb_page, NR_FILE_DIRTY); | ||
335 | res++; | 334 | res++; |
336 | if (res == LONG_MAX) | 335 | if (res == LONG_MAX) |
337 | goto out; | 336 | goto out; |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index a4c9df67a3..9624aecab9 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -440,7 +440,6 @@ nfs_mark_request_dirty(struct nfs_page *req) | |||
440 | nfs_list_add_request(req, &nfsi->dirty); | 440 | nfs_list_add_request(req, &nfsi->dirty); |
441 | nfsi->ndirty++; | 441 | nfsi->ndirty++; |
442 | spin_unlock(&nfsi->req_lock); | 442 | spin_unlock(&nfsi->req_lock); |
443 | inc_zone_page_state(req->wb_page, NR_FILE_DIRTY); | ||
444 | mark_inode_dirty(inode); | 443 | mark_inode_dirty(inode); |
445 | } | 444 | } |
446 | 445 | ||