From cdbf77286e5c1b2eddd7459db207392e771caa9c Mon Sep 17 00:00:00 2001
From: Fred Isaman <iisaman@netapp.com>
Date: Tue, 20 Mar 2012 12:51:24 -0400
Subject: [PATCH] --- yaml --- r: 294566 b: refs/heads/master c:
 c4f1b62a4b50a01e8d820717906b674807ef9ca3 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/fs/nfs/write.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 1de8bcfa02ad..e05487d68efb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 540a0f7584169651f485e8ab67461fcb06934e38
+refs/heads/master: c4f1b62a4b50a01e8d820717906b674807ef9ca3
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index 0de19f413f92..628d9a69d0a2 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -595,12 +595,9 @@ nfs_scan_commit(struct inode *inode, struct list_head *dst)
 	spin_lock(&inode->i_lock);
 	if (nfsi->ncommit > 0) {
 		const int max = INT_MAX;
-		int pnfs_ret;
 
 		ret = nfs_scan_commit_list(&nfsi->commit_list, dst, max);
-		pnfs_ret = pnfs_scan_commit_lists(inode, max - ret);
-		ret += pnfs_ret;
-		nfsi->ncommit -= ret;
+		ret += pnfs_scan_commit_lists(inode, max - ret);
 	}
 	spin_unlock(&inode->i_lock);
 	return ret;