diff options
| author | Sage Weil <sage@newdream.net> | 2009-12-22 11:24:33 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2009-12-23 08:17:22 -0800 |
| commit | 6df058c025ce343052c5516b1d8a9a7e73cddd64 (patch) | |
| tree | 58230bd258f71c2c3adf56a55d11ed39f404d12a /fs/ceph/msgr.h | |
| parent | 0cf90ab5b075821940873e73cdbfeb8edc3dabe8 (diff) | |
| download | linux-6df058c025ce343052c5516b1d8a9a7e73cddd64.tar.gz linux-6df058c025ce343052c5516b1d8a9a7e73cddd64.tar.bz2 linux-6df058c025ce343052c5516b1d8a9a7e73cddd64.zip | |
ceph: include transaction id in ceph_msg_header (protocol change)
Many (most?) message types include a transaction id. By including it in
the fixed size header, we always have it available even when we are unable
to allocate memory for the (larger, variable sized) message body. This
will allow us to error out the appropriate request instead of (silently)
dropping the reply.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/msgr.h')
| -rw-r--r-- | fs/ceph/msgr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ceph/msgr.h b/fs/ceph/msgr.h index c758e8f8f71b..e46d8b806dea 100644 --- a/fs/ceph/msgr.h +++ b/fs/ceph/msgr.h @@ -21,7 +21,7 @@ * whenever the wire protocol changes. try to keep this string length * constant. */ -#define CEPH_BANNER "ceph v024" +#define CEPH_BANNER "ceph v025" #define CEPH_BANNER_MAX_LEN 30 @@ -132,6 +132,7 @@ struct ceph_msg_connect_reply { */ struct ceph_msg_header { __le64 seq; /* message seq# for this session */ + __le64 tid; /* transaction id */ __le16 type; /* message type */ __le16 priority; /* priority. higher value == higher priority */ __le16 version; /* version of message encoding */ |