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;
 }