Commit 906369e4 authored Jun 08, 2012 by Fred Isaman Committed by Trond Myklebust Jun 09, 2012

NFS: fix directio refcount bug on commit



This reverts a hunk from commit 04277086
"NFS: Clean up - Simplify reference counting in fs/nfs/direct.c"

The cleanups in that patch affect the write path, but by the time
processing hits commit the removed reference has been added back by
nfs_scan_commit_list().  Without this reversion, any page that is
sent to commit holds on to an unbalanced reference that is never
freed.  The immediate effect is an imbalance over the wire between
OPENs and CLOSEs.

Signed-off-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

parent 2d0dbc6a

fs/nfs/direct.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -517,9 +517,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
		nfs_list_remove_request(req);
		if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES) {
		/* Note the rewrite will go through mds */
		kref_get(&req->wb_kref);
		nfs_mark_request_commit(req, NULL, &cinfo);
		}
		} else
		nfs_release_request(req);
		nfs_unlock_and_release_request(req);
		}

Admin message