From c9ab75b28835af4cee7578144845898afd9bff7f Mon Sep 17 00:00:00 2001
From: Joe Thornber <joe@fib011235813.fsnet.co.uk>
Date: Mon, 17 Jun 2002 15:50:16 +0000
Subject: [PATCH] o  Knock the version check out of the makefile, Alasdair will
 no doubt put it back :)

o  Change to new ioctl names.
---
 lib/Makefile.in          | 17 ++++++++---------
 lib/ioctl/libdevmapper.c | 32 ++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index ac08bc6..53fa82d 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -35,19 +35,18 @@ install_ioctl: ioctl/libdevmapper.so
 	$(LN_S) -f libdevmapper.so.$(LIB_VERSION).$(IOCTL_VERSION) \
 		 $(libdir)/libdevmapper.so.$(LIB_VERSION)
 
-ioctl/libdevmapper.o: ioctl_version
+#ioctl/libdevmapper.o: ioctl_version
 
-ioctl_version: ioctl/libdevmapper.c
-	@echo Checking library version compatible with kernel version in dm-ioctl.h
-	test "$(IOCTL_VERSION)" = \
-	     "$(shell $(CC) -E -dM $(INCLUDES) $(CFLAGS) \
-	      ioctl/libdevmapper.c | \
-	      awk -F '[ \t\"]+' '/DM_IOCTL_VERSION/ {print $$3}' )"
+#ioctl_version: ioctl/libdevmapper.c
+#	@echo Checking library version compatible with kernel version in dm-ioctl.h
+#	test "$(IOCTL_VERSION)" = \
+#	     "$(shell $(CC) -E -dM $(INCLUDES) $(CFLAGS) \
+#	      ioctl/libdevmapper.c | \
+#	      awk -F '[ \t\"]+' '/DM_IOCTL_VERSION/ {print $$3}' )"
 
 distclean_lib: 
 	$(RM) libdm-common.h
 
 distclean: distclean_lib
 
-.PHONY: ioctl_version distclean_lib distclean
-
+.PHONY: distclean_lib distclean
diff --git a/lib/ioctl/libdevmapper.c b/lib/ioctl/libdevmapper.c
index ebf77a0..f0545c0 100644
--- a/lib/ioctl/libdevmapper.c
+++ b/lib/ioctl/libdevmapper.c
@@ -76,11 +76,13 @@ void dm_task_destroy(struct dm_task *dmt)
 
 int dm_task_get_driver_version(struct dm_task *dmt, char *version, size_t size)
 {
+	unsigned int *v;
+
 	if (!dmt->dmi)
 		return 0;
 
-	strncpy(version, dmt->dmi->version, size);
-
+	v = dmt->dmi->version;
+	snprintf(version, size, "%u.%u.%u", v[0], v[1], v[2]);
 	return 1;
 }
 
@@ -281,7 +283,9 @@ static struct dm_ioctl *_flatten(struct dm_task *dmt)
 
 	memset(dmi, 0, len);
 
-	strncpy(dmi->version, DM_IOCTL_VERSION, sizeof(dmi->version));
+	dmi->version[0] = DM_IOCTL_MAJOR;
+	dmi->version[1] = DM_IOCTL_MINOR;
+	dmi->version[2] = DM_IOCTL_PATCH;
 	dmi->data_size = len;
 	dmi->data_start = sizeof(struct dm_ioctl);
 
@@ -341,15 +345,15 @@ int dm_task_run(struct dm_task *dmt)
 
 	switch (dmt->type) {
 	case DM_DEVICE_CREATE:
-		command = DM_CREATE;
+		command = DM_DEV_CREATE;
 		break;
 
 	case DM_DEVICE_RELOAD:
-		command = DM_RELOAD;
+		command = DM_DEV_RELOAD;
 		break;
 
 	case DM_DEVICE_REMOVE:
-		command = DM_REMOVE;
+		command = DM_DEV_REMOVE;
 		break;
 
 	case DM_DEVICE_REMOVE_ALL:
@@ -357,23 +361,23 @@ int dm_task_run(struct dm_task *dmt)
 		break;
 
 	case DM_DEVICE_SUSPEND:
-		command = DM_SUSPEND;
+		command = DM_DEV_SUSPEND;
 		break;
 
 	case DM_DEVICE_RESUME:
-		command = DM_SUSPEND;
+		command = DM_DEV_SUSPEND;
 		break;
 
 	case DM_DEVICE_INFO:
-		command = DM_INFO;
+		command = DM_DEV_STATUS;
 		break;
 
 	case DM_DEVICE_DEPS:
-		command = DM_DEPS;
+		command = DM_DEV_DEPS;
 		break;
 
 	case DM_DEVICE_RENAME:
-		command = DM_RENAME;
+		command = DM_DEV_RENAME;
 		break;
 
 	case DM_DEVICE_VERSION:
@@ -381,16 +385,16 @@ int dm_task_run(struct dm_task *dmt)
 		break;
 
 	case DM_DEVICE_STATUS:
-		command = DM_GET_STATUS;
+		command = DM_TARGET_STATUS;
 		break;
 
 	case DM_DEVICE_TABLE:
 		dmi->flags |= DM_STATUS_TABLE_FLAG;
-		command = DM_GET_STATUS;
+		command = DM_TARGET_STATUS;
 		break;
 
 	case DM_DEVICE_WAITEVENT:
-		command = DM_WAIT_EVENT;
+		command = DM_TARGET_WAIT;
 		break;
 
 	default:
-- 
2.43.5