Commit b55d84ba authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Philipp Reisner

drbd: Removed outdated comments and code that envisioned VNRs in header 95

Since have now header 100, that has space for 16 bit volume numbers,
the high byte of the length in header 95 is no longer reserved for
8 bit volume numbers.
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 0c8e36d9
...@@ -304,7 +304,7 @@ struct p_header80 { ...@@ -304,7 +304,7 @@ struct p_header80 {
struct p_header95 { struct p_header95 {
u16 magic; /* use DRBD_MAGIC_BIG here */ u16 magic; /* use DRBD_MAGIC_BIG here */
u16 command; u16 command;
u32 length; /* Use only 24 bits of that. Ignore the highest 8 bit. */ u32 length;
} __packed; } __packed;
struct p_header100 { struct p_header100 {
......
...@@ -721,7 +721,7 @@ static unsigned int prepare_header95(struct p_header95 *h, enum drbd_packet cmd, ...@@ -721,7 +721,7 @@ static unsigned int prepare_header95(struct p_header95 *h, enum drbd_packet cmd,
{ {
h->magic = cpu_to_be16(DRBD_MAGIC_BIG); h->magic = cpu_to_be16(DRBD_MAGIC_BIG);
h->command = cpu_to_be16(cmd); h->command = cpu_to_be16(cmd);
h->length = cpu_to_be32(size); h->length = cpu_to_be32(size);
return sizeof(struct p_header95); return sizeof(struct p_header95);
} }
......
...@@ -996,10 +996,9 @@ static int decode_header(struct drbd_tconn *tconn, void *header, struct packet_i ...@@ -996,10 +996,9 @@ static int decode_header(struct drbd_tconn *tconn, void *header, struct packet_i
} else if (header_size == sizeof(struct p_header95) && } else if (header_size == sizeof(struct p_header95) &&
*(__be16 *)header == cpu_to_be16(DRBD_MAGIC_BIG)) { *(__be16 *)header == cpu_to_be16(DRBD_MAGIC_BIG)) {
struct p_header95 *h = header; struct p_header95 *h = header;
pi->cmd = be16_to_cpu(h->command); pi->cmd = be16_to_cpu(h->command);
pi->size = be32_to_cpu(h->length) & 0x00ffffff; pi->size = be32_to_cpu(h->length);
pi->vnr = 0; pi->vnr = 0;
} else if (header_size == sizeof(struct p_header80) && } else if (header_size == sizeof(struct p_header80) &&
*(__be32 *)header == cpu_to_be32(DRBD_MAGIC)) { *(__be32 *)header == cpu_to_be32(DRBD_MAGIC)) {
struct p_header80 *h = header; struct p_header80 *h = header;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment