diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-10-17 18:22:55 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:35:49 -0800 |
| commit | b04a57568d86586d704babc7584e5fff4343fc61 (patch) | |
| tree | 87731a45f3bc4e34cf8e4689a8ed022e9d5f6697 /fs/nfs | |
| parent | 3cdf240310b4f3d94981d727d3660c78a50a40c6 (diff) | |
| download | kernel_samsung_smdk4412-b04a57568d86586d704babc7584e5fff4343fc61.zip kernel_samsung_smdk4412-b04a57568d86586d704babc7584e5fff4343fc61.tar.gz kernel_samsung_smdk4412-b04a57568d86586d704babc7584e5fff4343fc61.tar.bz2 | |
Revert "NFS: Ensure that writeback_single_inode() calls write_inode() when syncing"
commit 59b7c05fffba030e5d9e72324691e2f99aa69b79 upstream.
This reverts commit b80c3cb628f0ebc241b02e38dd028969fb8026a2.
The reverted commit was rendered obsolete by a VFS fix: commit
5547e8aac6f71505d621a612de2fca0dd988b439 (writeback: Update dirty flags in
two steps). We now no longer need to worry about writeback_single_inode()
missing our marking the inode for COMMIT in 'do_writepages()' call.
Reverting this patch, fixes a performance regression in which the inode
would continuously get queued to the dirty list, causing the writeback
code to unnecessarily try to send a COMMIT.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Tested-by: Simon Kirby <sim@hostway.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 7271680..07e9e79 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c @@ -428,7 +428,6 @@ static void nfs_mark_request_dirty(struct nfs_page *req) { __set_page_dirty_nobuffers(req->wb_page); - __mark_inode_dirty(req->wb_page->mapping->host, I_DIRTY_DATASYNC); } #if defined(CONFIG_NFS_V3) || defined(CONFIG_NFS_V4) @@ -762,6 +761,8 @@ int nfs_updatepage(struct file *file, struct page *page, status = nfs_writepage_setup(ctx, page, offset, count); if (status < 0) nfs_set_pageerror(page); + else + __set_page_dirty_nobuffers(page); dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n", status, (long long)i_size_read(inode)); |