---

yaml --- r: 234111 b: refs/heads/master c: d2224e7 h: refs/heads/master i: 234109: b2e0110 234107: 7047a8d 234103: b007639 234095: ae55611 234079: 3be91aa 234047: 9b182fe 233983: 1594574 v: v3
git-mirror · Mar 10, 2011 · eb2d3ab · eb2d3ab
1 parent 5a59b82
commit eb2d3ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;
 }