---

yaml --- r: 320365 b: refs/heads/master c: ee76e07 h: refs/heads/master i: 320363: 829750f v: v3
git-mirror · Jul 31, 2012 · 7c3871b · 7c3871b
1 parent 1bb681f
commit 7c3871b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8cb10063820af7ed7638e3fd9013eee21266e7
+refs/heads/master: ee76e0736db8455e3b11827d6899bd2a4e1d0584
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -519,14 +519,8 @@ void ceph_con_close(struct ceph_connection *con)
 	reset_connection(con);
 	con->peer_global_seq = 0;
 	cancel_delayed_work(&con->work);
+	con_close_socket(con);
 	mutex_unlock(&con->mutex);
-
-	/*
-	 * We cannot close the socket directly from here because the
-	 * work threads use it without holding the mutex.  Instead, let
-	 * con_work() do it.
-	 */
-	queue_con(con);
 }
 EXPORT_SYMBOL(ceph_con_close);