[DRBD-cvs] r1569 - in trunk: . drbd scripts user

[svn at svn.drbd.org]

Author: lars
Date: 2004-09-29 19:00:02 +0200 (Wed, 29 Sep 2004)
New Revision: 1569

Modified:
   trunk/
   trunk/INSTALL
   trunk/drbd/Makefile
   trunk/drbd/drbd_int.h
   trunk/scripts/drbd.gentoo
   trunk/user/drbdsetup.c
Log:
NO svnp run. Investigated 1556 to 1568 ...
that means fixes on branches/drbd-0.7 since it was created.

basically, everything but

r1568 by lars on 2004-09-29 18:03:18 +0200 (Wed, 29 Sep 2004)
  drbd.gentoo did a mknod drbd b 43; fixed...

and single lines of

r1560 by lars on 2004-09-24 13:38:25 +0200 (Fri, 24 Sep 2004)
  update: hint modules_prepare

and

r1559 by phil on 2004-09-24 13:13:51 +0200 (Fri, 24 Sep 2004) | 4 lines
  Made the "Warnung: comparison is always false due to limited 
  range of data type" warning go away on 32Bit platforms whe
  CONFIG_LBD ist not set.

was already merged here, or did not apply.

so now propagate:at of /trunk/ is 1569,
and all should be happy again.




Property changes on: trunk
___________________________________________________________________
Name: propagate:at
   - 1556
   + 1569

Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2004-09-29 16:03:18 UTC (rev 1568)
+++ trunk/INSTALL	2004-09-29 17:00:02 UTC (rev 1569)
@@ -116,7 +116,7 @@
    will only work properly with a matching kernel.
 
        all# make linux/include/version.h
-          # and since kernel 2.6.6 (some distos 2.6.5-something):
+          # and since kernel 2.6.6 (some distros 2.6.5-something):
        all# make modules_prepare
 
 == Build DRBD kernel module (outside of the kernel source) ==

Modified: trunk/drbd/Makefile
===================================================================
--- trunk/drbd/Makefile	2004-09-29 16:03:18 UTC (rev 1568)
+++ trunk/drbd/Makefile	2004-09-29 17:00:02 UTC (rev 1569)
@@ -74,8 +74,8 @@
   SRC_FILES := $(shell ls 2>/dev/null\
 	linux/drbd_config.h linux/drbd.h drbd_actlog.c drbd_bitmap.c drbd_fs.c \
 	drbd_main.c drbd_proc.c drbd_receiver.c drbd_req.c drbd_worker.c \
-	lru_cache.c drbd_compat_types.h drbd_compat_wrappers.h drbd_int.h \
-	lru_cache.h hlist.h mempool-2.4.c mempool.h)
+	lru_cache.c drbd_compat_wrappers.h drbd_int.h \
+	lru_cache.h )
 
   .PHONY: drbd.o default all greeting clean kbuild install dep
 

Modified: trunk/drbd/drbd_int.h
===================================================================
--- trunk/drbd/drbd_int.h	2004-09-29 16:03:18 UTC (rev 1568)
+++ trunk/drbd/drbd_int.h	2004-09-29 17:00:02 UTC (rev 1569)
@@ -894,8 +894,12 @@
 #define BM_EXT_PER_SECT	    ( 512 / BM_BYTES_PER_EXTENT )        //   4
  */
 
-#define DRBD_MAX_SECTORS \
+#if ( !defined(CONFIG_LBD) ) && ( BITS_PER_LONG == 32 )
+# define DRBD_MAX_SECTORS (0xffffffffLU)
+#else
+# define DRBD_MAX_SECTORS \
           ( (MD_RESERVED_SIZE*2LL - MD_BM_OFFSET) * (1LL<<(BM_EXT_SIZE_B-9)) )
+#endif
 
 extern int  drbd_bm_init      (drbd_dev *mdev);
 extern int  drbd_bm_resize    (drbd_dev *mdev, sector_t sectors);

Modified: trunk/scripts/drbd.gentoo
===================================================================
--- trunk/scripts/drbd.gentoo	2004-09-29 16:03:18 UTC (rev 1568)
+++ trunk/scripts/drbd.gentoo	2004-09-29 17:00:02 UTC (rev 1569)
@@ -18,12 +18,10 @@
 
 start() {
 	ebegin "Starting DRBD"
-	if [ ! -e /dev/drbd0 ] ; then
-	   /bin/mknod -m 0660 /dev/drbd0 b 43 0
-	fi
-	if [ ! -e /dev/drbd1 ] ; then
-	   /bin/mknod -m 0660 /dev/drbd1 b 43 1
-	fi
+	# strange that gentoo thinks this should be done by an init script
+	for i in `seq 0 15` ; do 
+	    test -b /dev/drbd$i || mknod -m 0660 /dev/drbd$i b 147 $i; 
+	done
 	${DRBDADM} up all
 #	/sbin/drbdadm wait_connect all
 	eend $ret
@@ -35,6 +33,20 @@
 	eend $?
 }
 
+status() {
+	# NEEDS to be heartbeat friendly...
+	# so: put some "OK" in the output.
+	ebegin "Status of DRBD"
+	if [ -e $PROC_DRBD ]; then
+	    echo "drbd driver OK; device status:"
+	    cat "$PROC_DRBD"
+	    eend 0
+	else
+	    echo >&2 "drbd not loaded"
+	    eend 3
+	fi
+}
+
 reload() {
 	ebegin "Reloading DRBD"
 	${DRBDADM} adjust all

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2004-09-29 16:03:18 UTC (rev 1568)
+++ trunk/user/drbdsetup.c	2004-09-29 17:00:02 UTC (rev 1569)
@@ -567,6 +567,7 @@
     [MDMounted]="Meta device is already mounted.",
     [LDMDInvalid]="Lower device / meta device / index combination invalid.",
     [LDDeviceTooLarge]="Currently we only support devices up to 3.998TB.\n"
+                       "(up to 2TB in case you do not have CONFIG_LBD set)",
                        "Contact office at linbit.com, if you need more.",
   };