Fix device number handling for 2.6 kernels.

diff --git a/VERSION b/VERSION
index c407ef6f4687a368de12e402e6bcd0f2e99f8c72..cba4c817bfb97ad82756ab5ca2af0c8580f095be 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.00.18-cvs (2004-06-20)
+1.00.19-cvs (2004-07-01)

diff --git a/WHATS_NEW b/WHATS_NEW
index e7e16a78fb735500847e928ead2ca29e80ec2e48..c1658b724974253fd1b442a54363a1c0ea89c6a8 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,7 @@
+Version 1.00.19 - 
+=============================
+  Fix device number handling for 2.6 kernels.
+
 Version 1.00.18 - 20 Jun 2004
 =============================
   Fix a uuid free in libdm-iface.

diff --git a/dmsetup/dmsetup.c b/dmsetup/dmsetup.c
index 4af94c9ffaf8fff3ac557ae5364fbf4a896d9366..3ea71f41f1ca5addae85b42dc4eef6fbffc9a3bb 100644 (file)
--- a/dmsetup/dmsetup.c
+++ b/dmsetup/dmsetup.c
@@ -38,7 +38,7 @@ extern char *optarg;
 #endif
 
 #ifdef linux
-#  include <linux/kdev_t.h>
+#  include "kdev_t.h"
 #else
 #  define MAJOR(x) major((x))
 #  define MINOR(x) minor((x))

diff --git a/include/kdev_t.h b/include/kdev_t.h
new file mode 100644 (file)
index 0000000..e5433d3
--- /dev/null
+++ b/include/kdev_t.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2004 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of the device-mapper userspace tools.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _LVM_KDEV_H
+#define _LVM_KDEV_H
+
+#define MAJOR(dev)      ((dev & 0xfff00) >> 8)
+#define MINOR(dev)      ((dev & 0xff) | ((dev >> 12) & 0xfff00))
+#define MKDEV(ma,mi)    ((mi & 0xff) | (ma << 8) | ((mi & ~0xff) << 12))
+
+#endif

diff --git a/lib/ioctl/libdm-compat.h b/lib/ioctl/libdm-compat.h
index ed6e85f29376797485cc8e1721177384d86cba86..4c06e7f3ac501f53182ce4c477a1548dad62c9d9 100644 (file)
--- a/lib/ioctl/libdm-compat.h
+++ b/lib/ioctl/libdm-compat.h
@@ -16,9 +16,9 @@
 #ifndef _LINUX_LIBDM_COMPAT_H
 #define _LINUX_LIBDM_COMPAT_H
 
+#include "kdev_t.h"
 #include <inttypes.h>
 #include <linux/dm-ioctl.h>
-#include <linux/kdev_t.h>
 #include <sys/ioctl.h>
 
 struct dm_task;

diff --git a/lib/ioctl/libdm-iface.c b/lib/ioctl/libdm-iface.c
index b9eec824eb9b166daeb40e6d847a1c67b17dc268..f84c262ed26adf583ccccdae53815456b26b89c6 100644 (file)
--- a/lib/ioctl/libdm-iface.c
+++ b/lib/ioctl/libdm-iface.c
@@ -33,8 +33,8 @@
 #include <limits.h>
 
 #ifdef linux
+#  include "kdev_t.h"
 #  include <linux/limits.h>
-#  include <linux/kdev_t.h>
 #  include <linux/dm-ioctl.h>
 #else
 #  define MAJOR(x) major((x))

diff --git a/lib/libdm-common.c b/lib/libdm-common.c
index b7454dc3cd3cff62a772b11c297eb6db40998d45..2fad9048963afb4782c1393358603ff01639e943 100644 (file)
--- a/lib/libdm-common.c
+++ b/lib/libdm-common.c
@@ -17,6 +17,7 @@
 #include "libdm-common.h"
 #include "list.h"
 #include "log.h"
+#include "kdev_t.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -27,7 +28,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <linux/dm-ioctl.h>
-#include <linux/kdev_t.h>
 
 #ifdef HAVE_SELINUX
 #  include <selinux/selinux.h>