[DRBD-cvs] r1471 - in trunk: . drbd scripts

[drbd-user@lists.linbit.com]

Author: phil
Date: 2004-07-30 13:29:14 +0200 (Fri, 30 Jul 2004)
New Revision: 1471

Modified:
   trunk/ChangeLog
   trunk/drbd/drbd_main.c
   trunk/scripts/drbd
Log:
* Reenabled the major_nr module parameter
* Preliminary changelog for 0.7.1
* Made it possible to tune DRBD's major number via /etc/default/drbd


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2004-07-30 09:36:53 UTC (rev 1470)
+++ trunk/ChangeLog	2004-07-30 11:29:14 UTC (rev 1471)
@@ -1,5 +1,20 @@
+0.7.1 (api:75/proto:74)
+-----
+  *) Upgrade instructions for 0.6.x -> 0.7.0 and 0.7.0 -> 0.7.1
+  *) Workaround for XFS' IO requests with page count of zero.
+  *) Handle the human and the timeout count correctly in the new init script.
+  *) The implementation of the incon-degr-cmd was missing, added.
+  *) Longer timeouts in drbdadm for drbdsetup commands witch operate on 
+     meta data.
+  *) New major number 147 (officially registered at lanana.org).
+  *) Added a missing w_resume_next_wg() in case we stop syncing because
+     of connection loss.
+  *) Fixed a Linux-2.2-ismus in recieve_data_tail(). Should considerably
+     speed up protocols A and B.
+  *) Some work on vendor kernel compatibility
+	
 0.7.0 (api:74/proto:74)
----
+-----
   Drbd-0.7 was actually forked off from drbd-0.6.1 (actually -pre18). 
 
   *) Complete new way of doing resynchronisation. Does no longer need

Modified: trunk/drbd/drbd_main.c
===================================================================
--- trunk/drbd/drbd_main.c	2004-07-30 09:36:53 UTC (rev 1470)
+++ trunk/drbd/drbd_main.c	2004-07-30 11:29:14 UTC (rev 1471)
@@ -95,11 +95,11 @@
 MODULE_AUTHOR("Philipp Reisner <phil@linbit.com>, Lars Ellenberg <lars@linbit.com>");
 MODULE_DESCRIPTION("drbd - Distributed Replicated Block Device v" REL_VERSION);
 MODULE_LICENSE("GPL");
-//MODULE_PARM_DESC(major_nr, "Major nr to use -- default " __stringify(CONFIG_DRBD_MAJOR) );
+MODULE_PARM_DESC(major_nr, "Major nr to use -- default " __stringify(CONFIG_DRBD_MAJOR) );
 MODULE_PARM_DESC(minor_count, "Maximum number of drbd devices (1-255)");
 MODULE_PARM_DESC(disable_io_hints, "Necessary if the loopback network device is used for DRBD" );
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-//MODULE_PARM(major_nr,"i");
+MODULE_PARM(major_nr,"i");
 MODULE_PARM(minor_count,"i");
 MODULE_PARM(disable_io_hints,"i");
 #else
@@ -118,7 +118,7 @@
  * these become boot parameters: [-drbd.major_nr-], drbd.minor_count and
  * drbd.disable_io_hints
  */
-//module_param(major_nr,        int,0);
+module_param(major_nr,        int,0);
 module_param(minor_count,     int,0);
 module_param(disable_io_hints,int,0);
 #endif

Modified: trunk/scripts/drbd
===================================================================
--- trunk/scripts/drbd	2004-07-30 09:36:53 UTC (rev 1470)
+++ trunk/scripts/drbd	2004-07-30 11:29:14 UTC (rev 1471)
@@ -22,6 +22,7 @@
 MODPROBE="modprobe"
 RMMOD="rmmod"
 UDEV_TIMEOUT=10
+ADD_MOD_PARAM=""
 
 if [ -f $DEFAULTFILE ]; then
   . $DEFAULTFILE
@@ -33,7 +34,7 @@
 {
     [ -e "$PROC_DRBD" ] && return
 
-    $MODPROBE -s drbd `$DRBDADM sh-mod-parms` || { 
+    $MODPROBE -s drbd `$DRBDADM sh-mod-parms` $ADD_MOD_PARAM || { 
 	echo "Can not load the drbd module."$'\n'; exit 20 
     }