ceph: separate banner and connect during handshake into distinct stages
We need to make sure we only swab the address during the banner once. So
break process_banner out of process_connect, and clean up the surrounding
code so that these are distinct phases of the handshake.
Signed-off-by: Sage Weil <sage@newdream.net>
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h
index e016fa7..80f7e1e 100644
--- a/fs/ceph/messenger.h
+++ b/fs/ceph/messenger.h
@@ -104,8 +104,8 @@
* thread is currently opening, reading or writing data to the socket.
*/
#define LOSSYTX 0 /* we can close channel or drop messages on errors */
-#define LOSSYRX 1 /* peer may reset/drop messages */
-#define CONNECTING 2
+#define CONNECTING 1
+#define NEGOTIATING 2
#define KEEPALIVE_PENDING 3
#define WRITE_PENDING 4 /* we have data ready to send */
#define QUEUED 5 /* there is work queued on this connection */