From eb2d3ab73b8872e530eca99c088e1e40b610f023 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Sun, 6 Mar 2011 17:14:13 +0000
Subject: [PATCH] --- yaml --- r: 234111 b: refs/heads/master c:
 d2224e7afbf2a6556f4f8f25bc0e96d99ec4d2bd h: refs/heads/master i:   234109:
 b2e01106b1f6ae2a885aa6307fa0825685574a5b   234107:
 7047a8d4049cbde7519171507596a7d4c868179b   234103:
 b007639156068c5ad6611d00044a3132a8007e9f   234095:
 ae55611582c83478eedda9a7ff315ea277a509e9   234079:
 3be91aa1581a96462f434b45bdfe37ef442bd4ec   234047:
 9b182fe55ad8c6319191ffddbee881314fc8766b   233983:
 15945742930acb89364858f42df2b790826d8b29 v: v3

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

diff --git a/[refs] b/[refs]
index bc6711be7ac6..7b1e8ef56ada 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bf294b41cefcb22fc3139e0f42c5b3f06728bd5e
+refs/heads/master: d2224e7afbf2a6556f4f8f25bc0e96d99ec4d2bd
diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c
index c8278f4046cb..42b92d7a9cc4 100644
--- a/trunk/fs/nfs/write.c
+++ b/trunk/fs/nfs/write.c
@@ -1292,6 +1292,8 @@ static int nfs_commit_rpcsetup(struct list_head *head,
 	task = rpc_run_task(&task_setup_data);
 	if (IS_ERR(task))
 		return PTR_ERR(task);
+	if (how & FLUSH_SYNC)
+		rpc_wait_for_completion_task(task);
 	rpc_put_task(task);
 	return 0;
 }