From aa0e1af86fedf5c5f87b37d5fa433a28701782f5 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 19 Feb 2010 17:02:24 -0800
Subject: [PATCH] --- yaml --- r: 186163 b: refs/heads/master c:
 5bad5abec4058c5214bfc72cec418348d6747977 h: refs/heads/master i:   186161:
 9c6d58bac4ddb49021f2bc2da546378b1f909298   186159:
 71e8fe0df68ee0481fff5614911144f0c9d4f638 v: v3

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

diff --git a/[refs] b/[refs]
index d9329d21bfb5..90d6438a8a69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 420e3646bb7d93a571734034249fbb1ae1a7a5c7
+refs/heads/master: 5bad5abec4058c5214bfc72cec418348d6747977
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index fc05e35da6a9..704e67d392e5 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -1426,7 +1426,7 @@ static int nfs_commit_unstable_pages(struct inode *inode, struct writeback_contr
 	    nfsi->ncommit <= (nfsi->npages >> 1))
 		goto out_mark_dirty;
 
-	if (wbc->nonblocking)
+	if (wbc->nonblocking || wbc->for_background)
 		flags = 0;
 	ret = nfs_commit_inode(inode, flags);
 	if (ret >= 0) {