[DRBD-cvs] svn commit by phil - r2399 - in trunk/drbd: . linux - This patch hopefully makes the copy-of-connector work o

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-09-11 13:57:21 +0200 (Mon, 11 Sep 2006)
New Revision: 2399

Modified:
   trunk/drbd/connector.c
   trunk/drbd/linux/connector.h
Log:
This patch hopefully makes the copy-of-connector work on kernels
that already have the connector code (e.g. 2.6.16) but it was 
disabled by the kernel configuration.



Modified: trunk/drbd/connector.c
===================================================================
--- trunk/drbd/connector.c	2006-09-11 10:41:30 UTC (rev 2398)
+++ trunk/drbd/connector.c	2006-09-11 11:57:21 UTC (rev 2399)
@@ -78,7 +78,7 @@
  * a new message.
  *
  */
-int cn_netlink_send(struct cn_msg *msg, u32 __group, int gfp_mask)
+int cn_netlink_send(struct cn_msg *msg, u32 __group, gfp_t gfp_mask)
 {
 	struct cn_callback_entry *__cbq;
 	unsigned int size;

Modified: trunk/drbd/linux/connector.h
===================================================================
--- trunk/drbd/linux/connector.h	2006-09-11 10:41:30 UTC (rev 2398)
+++ trunk/drbd/linux/connector.h	2006-09-11 11:57:21 UTC (rev 2399)
@@ -31,6 +31,12 @@
 #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
  */
@@ -161,7 +167,7 @@
 
 int cn_add_callback(struct cb_id *, char *, void (*callback) (void *));
 void cn_del_callback(struct cb_id *);
-int cn_netlink_send(struct cn_msg *, u32, int);
+int cn_netlink_send(struct cn_msg *, u32, gfp_t);
 
 int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id, void (*callback)(void *));
 void cn_queue_del_callback(struct cn_queue_dev *dev, struct cb_id *id);