---

yaml --- r: 294566 b: refs/heads/master c: c4f1b62 h: refs/heads/master v: v3
git-mirror · Mar 20, 2012 · cdbf772 · cdbf772
1 parent 5264d27
commit cdbf772
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;