diff options
| author | Sage Weil | 2009-11-10 23:34:36 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-11-10 23:34:48 +0100 |
| commit | eed0ef2caf928327332da54d23579debe629d5bc (patch) | |
| tree | 396319ef2e65cc775b1466f446edc535401c5cea /fs/ceph/messenger.h | |
| parent | ceph: do not confuse stale and dead (unreconnected) caps (diff) | |
| download | kernel-qcow2-linux-eed0ef2caf928327332da54d23579debe629d5bc.tar.gz kernel-qcow2-linux-eed0ef2caf928327332da54d23579debe629d5bc.tar.xz kernel-qcow2-linux-eed0ef2caf928327332da54d23579debe629d5bc.zip | |
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.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/messenger.h b/fs/ceph/messenger.h index e016fa7cf970..80f7e1e94448 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 */ |