[DRBD-cvs] svn commit by phil - r2043 - in trunk: . drbd - Make it compile again, latest thoughts to the ROADMAP.

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2005-12-29 22:58:57 +0100 (Thu, 29 Dec 2005)
New Revision: 2043

Modified:
   trunk/ROADMAP
   trunk/drbd/drbd_int.h
   trunk/drbd/drbd_main.c
Log:
Make it compile again, latest thoughts to the ROADMAP.


Modified: trunk/ROADMAP
===================================================================
--- trunk/ROADMAP	2005-12-29 21:50:17 UTC (rev 2042)
+++ trunk/ROADMAP	2005-12-29 21:58:57 UTC (rev 2043)
@@ -658,6 +658,9 @@
 26 Implement a kind of "dstate" command to make integration with 
    Heartbeat-2.0's master/slave-support possible.
 
+27 Remove all explicit drbd_md_write() calls, and create a mechanism,
+   that always keeps the on disk-metadata up-to-date implicit. 
+   Calling drbd_md_write() explicit is too errorprone.
 
 plus-banches:
 ----------------------

Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h	2005-12-29 21:50:17 UTC (rev 2042)
+++ trunk/drbd/drbd_int.h	2005-12-29 21:58:57 UTC (rev 2043)
@@ -1140,11 +1140,8 @@
  * inline helper functions
  *************************/
 
-<<<<<<< .working
 #include "drbd_compat_wrappers.h"
 
-=======
->>>>>>> .merge-right.r2000
 #define peer_mask role_mask
 #define pdsk_mask disk_mask
 

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2005-12-29 21:50:17 UTC (rev 2042)
+++ trunk/drbd/drbd_main.c	2005-12-29 21:58:57 UTC (rev 2043)
@@ -2301,7 +2301,6 @@
 	register_ioctl32_conversion(DRBD_IOCTL_UNCONFIG_DISK,NULL);
 	unlock_kernel();
 #endif
-#endif
 
 	printk(KERN_INFO DEVICE_NAME ": initialised. "
 	       "Version: " REL_VERSION " (api:%d/proto:%d)\n",