Commit 59b7c05f authored Oct 17, 2011 by Trond Myklebust

Revert "NFS: Ensure that writeback_single_inode() calls write_inode() when syncing"



This reverts commit b80c3cb6.

The reverted commit was rendered obsolete by a VFS fix: commit
5547e8aa (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>
Tested-by: Simon Kirby <sim@hostway.ca>
Cc: stable@kernel.org [2.6.35+]

parent 899e3ee4

fs/nfs/write.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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));

Admin message