---

yaml --- r: 267206 b: refs/heads/master c: 3236c3e h: refs/heads/master v: v3
git-mirror · Oct 18, 2011 · bd04e53 · bd04e53
1 parent d3c2dc9
commit bd04e53
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59b7c05fffba030e5d9e72324691e2f99aa69b79
+refs/heads/master: 3236c3e1adc0c7ec83eaff1de2d06746b7c5bb28
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
@@ -1554,6 +1554,10 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr
 	int flags = FLUSH_SYNC;
 	int ret = 0;
 
+	/* no commits means nothing needs to be done */
+	if (!nfsi->ncommit)
+		return ret;
+
 	if (wbc->sync_mode == WB_SYNC_NONE) {
 		/* Don't commit yet if this is a non-blocking flush and there
 		 * are a lot of outstanding writes for this mapping.