diff mbox

multipath-tools devmap_name/devmap_name.c kpar ...

Message ID 20091001225313.17761.qmail@sourceware.org (mailing list archive)
State New, archived
Delegated to: Benjamin Marzinski
Headers show

Commit Message

bmarzins@sourceware.org Oct. 1, 2009, 10:53 p.m. UTC 
None
diff mbox

Patch

--- multipath-tools/devmap_name/devmap_name.c	2005/11/16 20:24:57	1.3
+++ multipath-tools/devmap_name/devmap_name.c	2009/10/01 22:53:10	1.3.4.1
@@ -6,7 +6,6 @@ 
 #include <string.h>
 #include <ctype.h>
 #include <unistd.h>
-#include <linux/kdev_t.h>
 #include <libdevmapper.h>
 
 static void usage(char * progname) {
--- multipath-tools/kpartx/devmapper.c	2008/08/25 20:59:06	1.8.2.1
+++ multipath-tools/kpartx/devmapper.c	2009/10/01 22:53:11	1.8.2.2
@@ -7,7 +7,6 @@ 
 #include <stdint.h>
 #include <libdevmapper.h>
 #include <ctype.h>
-#include <linux/kdev_t.h>
 #include <errno.h>
 #include "devmapper.h"
 
--- multipath-tools/kpartx/devmapper.h	2008/08/25 20:59:06	1.5.2.1
+++ multipath-tools/kpartx/devmapper.h	2009/10/01 22:53:11	1.5.2.2
@@ -1,5 +1,9 @@ 
 #include <stdint.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))
+
 int dm_prereq (char *, int, int, int);
 int dm_simplecmd (int, const char *);
 int dm_addmap (int, const char *, const char *, const char *, uint64_t,
--- multipath-tools/kpartx/kpartx.c	2008/08/26 03:50:28	1.9.2.2
+++ multipath-tools/kpartx/kpartx.c	2009/10/01 22:53:11	1.9.2.3
@@ -30,7 +30,6 @@ 
 #include <sys/types.h>
 #include <ctype.h>
 #include <libdevmapper.h>
-#include <linux/kdev_t.h>
 
 #include "devmapper.h"
 #include "crc32.h"