From patchwork Thu Oct  1 22:53:13 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: bmarzins@sourceware.org
X-Patchwork-Id: 51044
X-Patchwork-Delegate: bmarzins@redhat.com
Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n91MrVDA016447
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Thu, 1 Oct 2009 22:53:31 GMT
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP id 5E9AD8E04D7;
	Thu,  1 Oct 2009 18:53:29 -0400 (EDT)
Received: from int-mx01.intmail.prod.int.phx2.redhat.com
	(nat-pool.util.phx.redhat.com [10.8.5.200])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	n91MrRtv001506 for <dm-devel@listman.util.phx.redhat.com>;
	Thu, 1 Oct 2009 18:53:27 -0400
Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com
	[10.5.110.5])
	by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with
	ESMTP id n91MrRqb027190
	for <dm-devel@redhat.com>; Thu, 1 Oct 2009 18:53:27 -0400
Received: from sourceware.org (sourceware.org [209.132.176.174])
	by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n91MrE0j020205
	for <dm-devel@redhat.com>; Thu, 1 Oct 2009 18:53:14 -0400
Received: (qmail 17763 invoked by uid 9475); 1 Oct 2009 22:53:13 -0000
Date: 1 Oct 2009 22:53:13 -0000
Message-ID: <20091001225313.17761.qmail@sourceware.org>
From: bmarzins@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
X-RedHat-Spam-Score: -4  (RCVD_IN_DNSWL_MED)
X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11
X-Scanned-By: MIMEDefang 2.67 on 10.5.110.5
X-loop: dm-devel@redhat.com
Cc: 
Subject: [dm-devel] multipath-tools devmap_name/devmap_name.c kpar ...
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com


--- 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"