summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher2011-03-22 13:17:47 +0100
committerPhilipp Reisner2012-11-08 16:45:10 +0100
commitb55d84ba17e90491ac2046583327d4756159efd6 (patch)
treed7db368b8209f70d50587834b5e21108c17a5a83 /drivers/block/drbd/drbd_receiver.c
parentdrbd: Introduce protocol version 100 headers (diff)
downloadkernel-qcow2-linux-b55d84ba17e90491ac2046583327d4756159efd6.tar.gz
kernel-qcow2-linux-b55d84ba17e90491ac2046583327d4756159efd6.tar.xz
kernel-qcow2-linux-b55d84ba17e90491ac2046583327d4756159efd6.zip
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: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_receiver.c')
-rw-r--r--drivers/block/drbd/drbd_receiver.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 311b95453cb7..f846e55c1740 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -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) &&
*(__be16 *)header == cpu_to_be16(DRBD_MAGIC_BIG)) {
struct p_header95 *h = header;
-
pi->cmd = be16_to_cpu(h->command);
- pi->size = be32_to_cpu(h->length) & 0x00ffffff;
- pi->vnr = 0;
+ pi->size = be32_to_cpu(h->length);
+ pi->vnr = 0;
} else if (header_size == sizeof(struct p_header80) &&
*(__be32 *)header == cpu_to_be32(DRBD_MAGIC)) {
struct p_header80 *h = header;