From c680783e88ec9783b8bd37b3ab672adab7df1646 Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Wed, 25 Nov 2009 17:50:00 +0100 Subject: [PATCH] --- yaml --- r: 172971 b: refs/heads/master c: 35a8a3fdcd4f973a5430e868f2f2a5c363803a5b h: refs/heads/master i: 172969: 37307e4e79cb1ecbce5d9193477473ffbd725af8 172967: e2fecbe8cb3e87771dbfb69c9e7143c99f4aad91 v: v3 --- [refs] | 2 +- trunk/include/linux/connector.h | 2 ++ trunk/include/linux/drbd.h | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 35bdd1698dab..4510a371010e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad85dfe67bbf13d5fa20764e4ce801a1e6e526d8 +refs/heads/master: 35a8a3fdcd4f973a5430e868f2f2a5c363803a5b diff --git a/trunk/include/linux/connector.h b/trunk/include/linux/connector.h index 3a14615fd35c..72ba63eb83c5 100644 --- a/trunk/include/linux/connector.h +++ b/trunk/include/linux/connector.h @@ -43,6 +43,8 @@ #define CN_DST_VAL 0x1 #define CN_IDX_DM 0x7 /* Device Mapper */ #define CN_VAL_DM_USERSPACE_LOG 0x1 +#define CN_IDX_DRBD 0x8 +#define CN_VAL_DRBD 0x1 #define CN_NETLINK_USERS 8 diff --git a/trunk/include/linux/drbd.h b/trunk/include/linux/drbd.h index 99a4d76694ed..e84f4733cb55 100644 --- a/trunk/include/linux/drbd.h +++ b/trunk/include/linux/drbd.h @@ -322,13 +322,6 @@ enum drbd_timeout_flag { #define DRBD_NL_CREATE_DEVICE 0x01 #define DRBD_NL_SET_DEFAULTS 0x02 -/* The following line should be moved over to linux/connector.h - * when the time comes */ -#ifndef CN_IDX_DRBD -# define CN_IDX_DRBD 0x4 -/* Ubuntu "intrepid ibex" release defined CN_IDX_DRBD as 0x6 */ -#endif -#define CN_VAL_DRBD 0x1 /* For searching a vacant cn_idx value */ #define CN_IDX_STEP 6977