[DRBD-cvs] drbd by phil; * Removed traces of "WakeAsender" pseudo...

drbd-user@lists.linbit.com drbd-user@lists.linbit.com
Mon, 2 Feb 2004 14:17:12 +0100 (CET)


DRBD CVS committal

Author  : phil
Module  : drbd

Dir     : drbd/drbd


Modified Files:
      Tag: rel-0_7-branch
	drbd_compat_wrappers.h drbd_int.h drbd_receiver.c 


Log Message:
* Removed traces of "WakeAsender" pseudo packet.
* Fixed drbd_ee_bio_prepare(). Now resync works on Linux-2.6. 

It is definitely fun to make the whole thing work, by just fixing
such little bugs.

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/Attic/drbd_compat_wrappers.h,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -3 -r1.1.2.19 -r1.1.2.20
--- drbd_compat_wrappers.h	1 Feb 2004 20:01:41 -0000	1.1.2.19
+++ drbd_compat_wrappers.h	2 Feb 2004 13:17:07 -0000	1.1.2.20
@@ -468,6 +468,8 @@
 	bio->bi_sector  = sector;
 	bio->bi_private = mdev;
 	bio->bi_next    = 0;
+	e->ee_sector = sector;
+	e->ee_size = size;
 }
 
 static inline void
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_int.h,v
retrieving revision 1.58.2.110
retrieving revision 1.58.2.111
diff -u -3 -r1.58.2.110 -r1.58.2.111
--- drbd_int.h	30 Jan 2004 20:12:34 -0000	1.58.2.110
+++ drbd_int.h	2 Feb 2004 13:17:07 -0000	1.58.2.111
@@ -292,7 +292,6 @@
  *********************************************************************/
 
 typedef enum {
-	WakeAsender,  // interrupted drbd_receive_header fakes this
 	Data,
 	DataReply,
 	RecvAck,      // Used in protocol B
@@ -320,7 +319,6 @@
 static inline const char* cmdname(Drbd_Packet_Cmd cmd)
 {
 	switch (cmd) {
-	case WakeAsender     : return "WakeAsender";
 	case Data            : return "Data";
 	case DataReply       : return "DataReply";
 	case RecvAck         : return "RecvAck";
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/drbd/drbd_receiver.c,v
retrieving revision 1.97.2.100
retrieving revision 1.97.2.101
diff -u -3 -r1.97.2.100 -r1.97.2.101
--- drbd_receiver.c	1 Feb 2004 20:01:41 -0000	1.97.2.100
+++ drbd_receiver.c	2 Feb 2004 13:17:07 -0000	1.97.2.101
@@ -1356,7 +1356,6 @@
 typedef int (*drbd_cmd_handler_f)(drbd_dev*,Drbd_Header*);
 
 static drbd_cmd_handler_f drbd_default_handler[] = {
-	[WakeAsender]      = NULL, // this is never seen on the net
 	[Data]             = receive_Data,
 	[DataReply]        = receive_DataReply,
 	[RecvAck]          = NULL, //receive_RecvAck,