---

yaml --- r: 320291 b: refs/heads/master c: a8d00e3 h: refs/heads/master i: 320289: 6317679 320287: a39c023 v: v3
git-mirror · Jul 6, 2012 · 184808f · 184808f
1 parent 2bcf499
commit 184808f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abdaa6a849af1d63153682c11f5bbb22dacb1f6b
+refs/heads/master: a8d00e3cdef4c1c4f194414b72b24cd995439a05
diff --git a/trunk/net/ceph/messenger.c b/trunk/net/ceph/messenger.c
@@ -397,11 +397,11 @@ static int con_close_socket(struct ceph_connection *con)
 	dout("con_close_socket on %p sock %p\n", con, con->sock);
 	if (!con->sock)
 		return 0;
-	set_bit(SOCK_CLOSED, &con->state);
+	set_bit(SOCK_CLOSED, &con->flags);
 	rc = con->sock->ops->shutdown(con->sock, SHUT_RDWR);
 	sock_release(con->sock);
 	con->sock = NULL;
-	clear_bit(SOCK_CLOSED, &con->state);
+	clear_bit(SOCK_CLOSED, &con->flags);
 	con_sock_state_closed(con);
 	return rc;
 }