Index: drbd_receiver.c
===================================================================
--- drbd_receiver.c	(revision 3552)
+++ drbd_receiver.c	(working copy)
@@ -2373,8 +2373,6 @@
 		else
 			handler = NULL;
 
-		dump_packet(mdev,mdev->data.socket,2,&mdev->data.rbuf, __FILE__, __LINE__);
-
 		if (unlikely(!handler)) {
 			ERR("unknown packet type %d, l: %d!\n",
 			    header->command, header->length);
@@ -2385,6 +2383,8 @@
 			    cmdname(header->command), header->length);
 			break;
 		}
+
+		dump_packet(mdev,mdev->data.socket,2,&mdev->data.rbuf, __FILE__, __LINE__);
 	}
 }
 
Index: drbd_main.c
===================================================================
--- drbd_main.c	(revision 3552)
+++ drbd_main.c	(working copy)
@@ -2935,6 +2935,7 @@
 {
 	char *sockname = sock == mdev->meta.socket ? "meta" : "data";
 	int cmd = (recv == 2) ? p->head.command : be16_to_cpu(p->head.command);
+	u16 plen = (recv == 2) ? p->head.length : be16_to_cpu(p->head.length);
 	char tmp[300];
 	drbd_state_t m,v;
 
@@ -2947,19 +2948,21 @@
 		break;
 
 	case Data:
-		INFOP("%s (sector %llx, id %llx, seq %x, f %x)\n", cmdname(cmd),
-		     (long long)be64_to_cpu(p->Data.sector), 
-		     (long long)be64_to_cpu(p->Data.block_id),
-		     be32_to_cpu(p->Data.seq_num),
-		     be32_to_cpu(p->Data.dp_flags)
+		INFOP("%s (sector %0llx, size %x, id %llx, seq %x, f %x)\n", cmdname(cmd),
+		      (long long)be64_to_cpu(p->Data.sector),
+		      plen - (sizeof(Drbd_Data_Packet)-sizeof(Drbd_Header)),
+		      p->Data.block_id,
+		      be32_to_cpu(p->Data.seq_num),
+		      be32_to_cpu(p->Data.dp_flags)
 		);
 		break;
 
 	case DataReply:
 	case RSDataReply:
-		INFOP("%s (sector %llx, id %llx)\n", cmdname(cmd),
-		     (long long)be64_to_cpu(p->Data.sector), 
-		     (long long)be64_to_cpu(p->Data.block_id)
+		INFOP("%s (sector %llx, size %x, id %llx)\n", cmdname(cmd),
+		     (long long)be64_to_cpu(p->Data.sector),
+		      plen - (sizeof(Drbd_Data_Packet)-sizeof(Drbd_Header)),
+		     p->Data.block_id
 		);
 		break;
 
@@ -2969,7 +2972,7 @@
 		INFOP("%s (sector %llx, size %x, id %llx, seq %x)\n", cmdname(cmd),
 		     (long long)be64_to_cpu(p->BlockAck.sector), 
 		     be32_to_cpu(p->BlockAck.blksize),
-		     (long long)be64_to_cpu(p->BlockAck.block_id),
+		     p->BlockAck.block_id,
 		     be32_to_cpu(p->BlockAck.seq_num)
 		);
 		break;
@@ -2979,7 +2982,7 @@
 		INFOP("%s (sector %llx, size %x, id %llx)\n", cmdname(cmd),
 		     (long long)be64_to_cpu(p->BlockRequest.sector), 
 		     be32_to_cpu(p->BlockRequest.blksize),
-		     (long long)be64_to_cpu(p->BlockRequest.block_id)
+		     p->BlockRequest.block_id
 		);
 		break;
 
@@ -3018,7 +3021,7 @@
 
 	case DiscardNote:
 		INFOP("%s (id %llx, seq %x)\n", cmdname(cmd),
-		     (long long)be64_to_cpu(p->Discard.block_id),
+		     p->Discard.block_id,
 		     be32_to_cpu(p->Discard.seq_num));
 		break;