diff options
authorTrond Myklebust <>2011-10-17 18:22:55 -0700
committerGreg Kroah-Hartman <>2011-11-11 09:43:02 -0800
commitddd5310cb95cac1f698d3f9e35c454e32699b81d (patch)
parent112e8e4019fdf3fc987cf0f839a2bfbd6c169e60 (diff)
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 <> Tested-by: Simon Kirby <> Signed-off-by: Greg Kroah-Hartman <>
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index 62eb5c5f2485..86e9b3f9d335 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)
- __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)
+ else
+ __set_page_dirty_nobuffers(page);
dprintk("NFS: nfs_updatepage returns %d (isize %lld)\n",
status, (long long)i_size_read(inode));