1 files changed, 13 insertions, 12 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index ae082d95fc72..09ada7924874 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -48,17 +48,17 @@
 *       |        ----------------------
 *       |                              \
 *       + con_sock_state_closed()       \
- *       |\                               \
+ *       |+---------------------------    \
- *       | \                               \
+ *       | \                          \    \
- *       |  -----------                     \
+ *       |  -----------                \    \
- *       |  | CLOSING |  socket event;       \
+ *       |  | CLOSING |  socket event;  \    \
- *       |  -----------  await close          \
+ *       |  -----------  await close     \    \
- *       |       ^                            |
+ *       |       ^                        \   |
- *       |       |                            |
+ *       |       |                         \  |
- *       |       + con_sock_state_closing()   |
+ *       |       + con_sock_state_closing() \ |
- *       |      / \                           |
+ *       |      / \                         | |
- *       |     /   ---------------            |
+ *       |     /   ---------------          | |
- *       |    /                   \           v
+ *       |    /                   \         v v
 *       |   /                    --------------
 *       |  /    -----------------| CONNECTING |  socket created, TCP
 *       |  |   /                 --------------  connect initiated
@@ -241,7 +241,8 @@ static void con_sock_state_closed(struct ceph_connection *con)
        old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CLOSED);
        if (WARN_ON(old_state != CON_SOCK_STATE_CONNECTED &&
-                        old_state != CON_SOCK_STATE_CLOSING))
+                    old_state != CON_SOCK_STATE_CLOSING &&
+                    old_state != CON_SOCK_STATE_CONNECTING))
                printk("%s: unexpected old state %d\n", __func__, old_state);
 }

diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index ae082d95fc72..09ada7924874 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c
@@ -48,17 +48,17 @@
48	* \| ----------------------	48	* \| ----------------------
49	* \| \	49	* \| \
50	* + con_sock_state_closed() \	50	* + con_sock_state_closed() \
51	* \|\ \	51	* \|+--------------------------- \
52	* \| \ \	52	* \| \ \ \
53	* \| ----------- \	53	* \| ----------- \ \
54	* \| \| CLOSING \| socket event; \	54	* \| \| CLOSING \| socket event; \ \
55	* \| ----------- await close \	55	* \| ----------- await close \ \
56	* \| ^ \|	56	* \| ^ \ \|
57	* \| \| \|	57	* \| \| \ \|
58	* \| + con_sock_state_closing() \|	58	* \| + con_sock_state_closing() \ \|
59	* \| / \ \|	59	* \| / \ \| \|
60	* \| / --------------- \|	60	* \| / --------------- \| \|
61	* \| / \ v	61	* \| / \ v v
62	* \| / --------------	62	* \| / --------------
63	* \| / -----------------\| CONNECTING \| socket created, TCP	63	* \| / -----------------\| CONNECTING \| socket created, TCP
64	* \| \| / -------------- connect initiated	64	* \| \| / -------------- connect initiated
@@ -241,7 +241,8 @@ static void con_sock_state_closed(struct ceph_connection *con)
241		241
242	old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CLOSED);	242	old_state = atomic_xchg(&con->sock_state, CON_SOCK_STATE_CLOSED);
243	if (WARN_ON(old_state != CON_SOCK_STATE_CONNECTED &&	243	if (WARN_ON(old_state != CON_SOCK_STATE_CONNECTED &&
244	old_state != CON_SOCK_STATE_CLOSING))	244	old_state != CON_SOCK_STATE_CLOSING &&
		245	old_state != CON_SOCK_STATE_CONNECTING))
245	printk("%s: unexpected old state %d\n", __func__, old_state);	246	printk("%s: unexpected old state %d\n", __func__, old_state);
246	}	247	}
247		248