Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/block/drbd/drbd_int.h

+1 −1
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ struct p_header80 { 
struct p_header95 {

	u16	  magic;	/* use DRBD_MAGIC_BIG here */

	u16	  command;

	u32	  length;	/* Use only 24 bits of that. Ignore the highest 8 bit. */

	u32	  length;

} __packed;



struct p_header100 {

drivers/block/drbd/drbd_receiver.c

+2 −3
Original line number Diff line number Diff line
@@ -996,9 +996,8 @@ 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->size = be32_to_cpu(h->length);

		pi->vnr = 0;

	} else if (header_size == sizeof(struct p_header80) &&

		   *(__be32 *)header == cpu_to_be32(DRBD_MAGIC)) {

drivers/block/drbd/drbd_main.c

+1 −1

File changed.

Contains only whitespace changes.