---

yaml --- r: 188621 b: refs/heads/master c: 71ececd h: refs/heads/master i: 188619: c6fece0 v: v3
git-mirror · Nov 18, 2009 · 1a28b2e · 1a28b2e
1 parent 1f4d0eb
commit 1a28b2e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42ce56e50d948fc7c1c8c3a749ee5a21a7e134f6
+refs/heads/master: 71ececdacae24be333c534869cb1b06357f0e215
diff --git a/trunk/fs/ceph/messenger.c b/trunk/fs/ceph/messenger.c
@@ -339,17 +339,6 @@ void ceph_con_close(struct ceph_connection *con)
 	queue_con(con);
 }
 
-/*
- * clean up connection state
- */
-void ceph_con_shutdown(struct ceph_connection *con)
-{
-	dout("con_shutdown %p\n", con);
-	reset_connection(con);
-	set_bit(DEAD, &con->state);
-	con_close_socket(con); /* silently ignore errors */
-}
-
 /*
  * Reopen a closed connection, with a new peer address.
  */
@@ -380,7 +369,7 @@ void ceph_con_put(struct ceph_connection *con)
 	     atomic_read(&con->nref), atomic_read(&con->nref) - 1);
 	BUG_ON(atomic_read(&con->nref) == 0);
 	if (atomic_dec_and_test(&con->nref)) {
-		ceph_con_shutdown(con);
+		BUG_ON(con->sock);
 		kfree(con);
 	}
 }