[DRBD-cvs] svn commit by phil - r2404 - in trunk: drbd/linux user - * Another micro fix to drbd/linux/connector.h, to make

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-09-11 20:23:31 +0200 (Mon, 11 Sep 2006)
New Revision: 2404

Modified:
   trunk/drbd/linux/connector.h
   trunk/user/Makefile
   trunk/user/drbdsetup.c
Log:
* Another micro fix to drbd/linux/connector.h, to make it compile 
  under all circumstances.
* Fixed a bug in drbdsetup conv_handler(), that caused the 
  after-sb-[0-2]pri handlers to get set to the wrong values.


Modified: trunk/drbd/linux/connector.h
===================================================================
--- trunk/drbd/linux/connector.h	2006-09-11 15:05:38 UTC (rev 2403)
+++ trunk/drbd/linux/connector.h	2006-09-11 18:23:31 UTC (rev 2404)
@@ -31,12 +31,6 @@
 #define CN_IDX_CONNECTOR		0xffffffff
 #define CN_VAL_CONNECTOR		0xffffffff
 
-#ifdef NETLINK_ROUTE6
-   /* pre 2.6.16 */
-   /* This ifdef check needs to be refined */
-typedef unsigned __bitwise__ gfp_t;
-#endif
-
 /*
  * Process Events connector unique ids -- used for message routing
  */
@@ -100,6 +94,12 @@
 
 #ifdef __KERNEL__
 
+#ifdef NETLINK_ROUTE6
+   /* pre 2.6.16 */
+   /* This ifdef check needs to be refined */
+typedef unsigned __bitwise__ gfp_t;
+#endif
+
 #include <asm/atomic.h>
 
 #include <linux/list.h>

Modified: trunk/user/Makefile
===================================================================
--- trunk/user/Makefile	2006-09-11 15:05:38 UTC (rev 2403)
+++ trunk/user/Makefile	2006-09-11 18:23:31 UTC (rev 2404)
@@ -21,8 +21,6 @@
 
 CC = gcc
 CFLAGS = -g -O2 -c -W -Wall -I../drbd
-# for the netlink connector stuff <linux/connector.h>:
-drbdsetup: CFLAGS += -I$(KDIR)/include
 
 drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \
 	      drbdadm_adjust.o drbdtool_common.o drbdadm_usage_cnt.o \

Modified: trunk/user/drbdsetup.c
===================================================================
--- trunk/user/drbdsetup.c	2006-09-11 15:05:38 UTC (rev 2403)
+++ trunk/user/drbdsetup.c	2006-09-11 18:23:31 UTC (rev 2404)
@@ -618,12 +618,12 @@
 {
 	const char** handler_names = od->handler_param.handler_names;
 	const int number_of_handlers = od->handler_param.number_of_handlers;
-	int i,nr=-1;
+	int i;
 
 	for(i=0;i<number_of_handlers;i++) {
 		if(handler_names[i]==NULL) continue;
 		if(strcmp(arg,handler_names[i])==0) {
-			add_tag(tl,od->tag,&nr,sizeof(i));
+			add_tag(tl,od->tag,&i,sizeof(i));
 			return 0;
 		}
 	}