summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2009-11-25 17:50:00 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2009-11-25 17:57:36 +0100
commit35a8a3fdcd4f973a5430e868f2f2a5c363803a5b (patch)
treebdf7e2d8c7ae482251b348e526fa1260f67f3eef
parentad85dfe67bbf13d5fa20764e4ce801a1e6e526d8 (diff)
drbd: moved CN_IDX_DRBD and CN_VAL_DRBD to the right file
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--include/linux/connector.h2
-rw-r--r--include/linux/drbd.h7
2 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h
index 3a14615fd35c..72ba63eb83c5 100644
--- a/include/linux/connector.h
+++ b/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/include/linux/drbd.h b/include/linux/drbd.h
index 99a4d76694ed..e84f4733cb55 100644
--- a/include/linux/drbd.h
+++ b/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