---

yaml --- r: 2795 b: refs/heads/master c: ae38846 h: refs/heads/master i: 2793: 1fcdcbd 2791: 3454994 v: v3
git-mirror · Jun 22, 2005 · 53ae0a9 · 53ae0a9
1 parent 52bdf74
commit 53ae0a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e5ac828dfd23b9080159c62a34f32d2dcd92fc
+refs/heads/master: ae3884621bf5b4caff7785b9a417f262202965b2
diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c
@@ -569,8 +569,11 @@ void xprt_connect(struct rpc_task *task)
 		if (xprt->sock != NULL)
 			schedule_delayed_work(&xprt->sock_connect,
 					RPC_REESTABLISH_TIMEOUT);
-		else
+		else {
 			schedule_work(&xprt->sock_connect);
+			if (!RPC_IS_ASYNC(task))
+				flush_scheduled_work();
+		}
 	}
 	return;
  out_write:
@@ -1685,6 +1688,10 @@ xprt_shutdown(struct rpc_xprt *xprt)
 	rpc_wake_up(&xprt->backlog);
 	wake_up(&xprt->cong_wait);
 	del_timer_sync(&xprt->timer);
+
+	/* synchronously wait for connect worker to finish */
+	cancel_delayed_work(&xprt->sock_connect);
+	flush_scheduled_work();
 }
 
 /*