summaryrefslogtreecommitdiffstats
path: root/fs/ceph/messenger.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-11-10 14:34:36 -0800
committerSage Weil <sage@newdream.net>2009-11-10 14:34:48 -0800
commiteed0ef2caf928327332da54d23579debe629d5bc (patch)
tree396319ef2e65cc775b1466f446edc535401c5cea /fs/ceph/messenger.h
parent685f9a5d14194fc35db73e5e7370740ccc14b64a (diff)
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>
Diffstat (limited to 'fs/ceph/messenger.h')
-rw-r--r--fs/ceph/messenger.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h
index e016fa7cf97..80f7e1e9444 100644
--- a/fs/ceph/messenger.h
+++ b/fs/ceph/messenger.h
@@ -104,8 +104,8 @@ struct ceph_msg_pos {
* 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 */