Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay

11 files changed, 253 insertions, 119 deletions

diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c
index 34b1ccdff1..9df0fdb107 100644
--- a/extras/ata_id/ata_id.c
+++ b/extras/ata_id/ata_id.c
@@ -107,6 +107,8 @@ int main(int argc, char *argv[])
 	int fd;
 	int rc = 0;
 
+	logging_init("ata_id");
+
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];
 
@@ -167,8 +169,12 @@ int main(int argc, char *argv[])
 		printf("ID_MODEL=%s\n", model);
 		printf("ID_SERIAL=%s\n", serial);
 		printf("ID_REVISION=%s\n", revision);
-	} else
-		printf("%s_%s\n", model, serial);
+	} else {
+		if (serial[0] != '\0')
+			printf("%s_%s\n", model, serial);
+		else
+			printf("%s\n", model);
+	}
 
 close:
 	close(fd);
diff --git a/extras/dasd_id/Makefile b/extras/dasd_id/Makefile
new file mode 100644
index 0000000000..33bb6965cd
--- /dev/null
+++ b/extras/dasd_id/Makefile
@@ -0,0 +1,52 @@
+# Makefile for dasd_id
+#
+# Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+#
+
+PROG = dasd_id
+
+all:	$(PROG)
+
+prefix =
+exec_prefix =	${prefix}
+etcdir =	${prefix}/etc
+sbindir =	${exec_prefix}/sbin
+usrbindir =	${exec_prefix}/usr/bin
+usrsbindir =	${exec_prefix}/usr/sbin
+mandir =	${prefix}/usr/share/man
+devddir =	${etcdir}/dev.d/default
+configdir =	${etcdir}/udev/
+initdir = 	${etcdir}/init.d/
+srcdir = .
+
+INSTALL = /usr/bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA  = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL_PROGRAM}
+
+CFLAGS+=-D_FILE_OFFSET_BITS=64
+
+OBJS = dasd_id.o ../../udev.a
+
+$(OBJS): $(HEADERS)
+
+.c.o:
+	$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
+
+$(PROG): $(OBJS) $(HEADERS)
+	$(QUIET) $(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LIB_OBJS)
+
+clean:
+	rm -f $(PROG) $(OBJS)
+
+spotless: clean
+
+install: all
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+
+uninstall:
+	- rm $(DESTDIR)$(sbindir)/$(PROG)
diff --git a/extras/volume_id/volume_id/dasd.c b/extras/dasd_id/dasd_id.c
index 6f403cb928..5c2143f45d 100644
--- a/extras/volume_id/volume_id/dasd.c
+++ b/extras/dasd_id/dasd_id.c
@@ -31,13 +31,42 @@
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 #include <sys/ioctl.h>
 #include <asm/types.h>
 
-#include "volume_id.h"
-#include "logging.h"
-#include "util.h"
-#include "dasd.h"
+#include "../../logging.h"
+#include "../../udev_utils.h"
+
+#ifdef USE_LOG
+void log_message(int priority, const char *format, ...)
+{
+	va_list args;
+	static int udev_log = -1;
+
+	if (udev_log == -1) {
+		const char *value;
+
+		value = getenv("UDEV_LOG");
+		if (value)
+			udev_log = log_priority(value);
+		else
+			udev_log = LOG_ERR;
+	}
+
+	if (priority > udev_log)
+		return;
+
+	va_start(args, format);
+	vsyslog(priority, format, args);
+	va_end(args);
+}
+#endif
+
+/*
+ * Only compile this on S/390. Doesn't make any sense
+ * for other architectures.
+ */
 
 static unsigned char EBCtoASC[256] =
 {
@@ -55,7 +84,7 @@ static unsigned char EBCtoASC[256] =
                                 -INP                   */
 	0x07, 0x07, 0x1C, 0x07, 0x07, 0x0A, 0x17, 0x1B,
 /* 0x28  -SA  -SFE   -SM  -CSP  -MFA   ENQ   ACK   BEL
-                     -SW                               */ 
+                     -SW                               */
 	0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07,
 /* 0x30 ----  ----   SYN   -IR   -PP  -TRN  -NBS   EOT */
 	0x07, 0x07, 0x16, 0x07, 0x07, 0x07, 0x07, 0x04,
@@ -71,7 +100,7 @@ static unsigned char EBCtoASC[256] =
 	0x8D, 0xE1, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0xAA,
 /* 0x60    -     /  ----     Ä  ----  ----  ----       */
 	0x2D, 0x2F, 0x07, 0x8E, 0x07, 0x07, 0x07, 0x8F,
-/* 0x68             ----     ,     %     _     >     ? */ 
+/* 0x68             ----     ,     %     _     >     ? */
 	0x80, 0xA5, 0x07, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,
 /* 0x70  ---        ----  ----  ----  ----  ----  ---- */
 	0x07, 0x90, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
@@ -111,15 +140,15 @@ static unsigned char EBCtoASC[256] =
 	0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07
 };
 
-static void vtoc_ebcdic_dec (const unsigned char *source, unsigned char *target, int l) 
+static void vtoc_ebcdic_dec (const unsigned char *source, char *target, int l) 
 {
 	int i;
 
 	for (i = 0; i < l; i++) 
-		target[i]=EBCtoASC[(unsigned char)(source[i])];
+		target[i]=(char)EBCtoASC[(unsigned char)(source[i])];
 }
 
-/* 
+/*
  * struct dasd_information_t
  * represents any data about the data, which is visible to userspace
  */
@@ -144,54 +173,101 @@ typedef struct dasd_information_t {
 	char configuration_data[256];	/* from read_configuration_data */
 } dasd_information_t;
 
-#define _IOC_NRBITS		8
-#define _IOC_TYPEBITS		8
-#define _IOC_SIZEBITS		14
-#define _IOC_DIRBITS		2
-#define _IOC_NRMASK		((1 << _IOC_NRBITS)-1)
-#define _IOC_TYPEMASK		((1 << _IOC_TYPEBITS)-1)
-#define _IOC_SIZEMASK		((1 << _IOC_SIZEBITS)-1)
-#define _IOC_DIRMASK		((1 << _IOC_DIRBITS)-1)
-#define _IOC_NRSHIFT		0
-#define _IOC_TYPESHIFT		(_IOC_NRSHIFT+_IOC_NRBITS)
-#define _IOC_SIZESHIFT		(_IOC_TYPESHIFT+_IOC_TYPEBITS)
-#define _IOC_DIRSHIFT		(_IOC_SIZESHIFT+_IOC_SIZEBITS)
 #define DASD_IOCTL_LETTER	 'D'
-
 #define BIODASDINFO _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
 #define BLKSSZGET _IO(0x12,104)
 
-int volume_id_probe_dasd(struct volume_id *id)
+unsigned char serial[8];
+
+static int dasd_id(int fd)
 {
 	int blocksize;
 	dasd_information_t info;
 	__u8 *data;
 	__u8 *label_raw;
-	unsigned char name[7];
-
-	dbg("probing");
 
-	if (ioctl(id->fd, BIODASDINFO, &info) != 0)
+	if (ioctl(fd, BIODASDINFO, &info) != 0) {
+		dbg("not a dasd");
 		return -1;
+	}
 
-	if (ioctl(id->fd, BLKSSZGET, &blocksize) != 0)
-		return -1;
+		if (ioctl(fd, BLKSSZGET, &blocksize) != 0) {
+			err("failed to get blocksize");
+			return -1;
+		}
 
-	data = volume_id_get_buffer(id, info.label_block * blocksize, 16);
-	if (data == NULL)
-		return -1;
+		if (lseek(fd,info.label_block * blocksize, SEEK_SET) == -1) {
+			err("seek failed on dasd");
+			return -1;
+		}
+
+		data = malloc(blocksize);
+		if (data == NULL)
+			return -1;
+
+		if (read(fd, data, blocksize) == -1) {
+			err("read disklabel failed");
+			free(data);
+			return -1;
+		}
 
-	if ((!info.FBA_layout) && (!strcmp(info.type, "ECKD")))
-		label_raw = &data[8];
-	else
-		label_raw = &data[4];
+		if ((!info.FBA_layout) && (!strcmp(info.type, "ECKD")))
+			label_raw = &data[8];
+		else
+			label_raw = &data[4];
+		serial[6] = '\0';
 
-	name[6] = '\0';
-	volume_id_set_usage(id, VOLUME_ID_DISKLABEL);
-	id->type = "dasd";
-	volume_id_set_label_raw(id, label_raw, 6);
-	vtoc_ebcdic_dec(label_raw, name, 6);
-	volume_id_set_label_string(id, name, 6);
+		vtoc_ebcdic_dec(label_raw, serial, 6);
+		free(data);
+
+		return 0;
+	}
+
+int main(int argc, char *argv[])
+{
+	const char *node = NULL;
+	int i;
+	int export = 0;
+	int fd;
+	int rc = 0;
 
-	return 0;
+	logging_init("dasd_id");
+
+	for (i = 1; i < argc; i++) {
+		char *arg = argv[i];
+
+		if (strcmp(arg, "--export") == 0) {
+			export = 1;
+		} else
+			node = arg;
+	}
+	if (!node) {
+		err("no node specified");
+		rc = 1;
+		goto exit;
+	}
+
+	fd = open(node, O_RDONLY);
+	if (fd < 0) {
+		err("unable to open '%s'", node);
+		rc = 1;
+		goto exit;
+	}
+
+	if (dasd_id(fd) < 0) {
+		err("dasd_id failed: %s", strerror(errno));
+		rc = 1;
+	}
+
+	if (export) {
+		printf("ID_TYPE=disk\n");
+		printf("ID_SERIAL=%s\n",serial);
+	} else
+		printf("%s\n", serial);
+
+	close(fd);
+exit:
+	logging_close();
+	return rc;
 }
+
diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 4003ee6af5..cbefb445df 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -52,7 +52,7 @@
  * options are not supported, but other code is still left in place for
  * now.
  */
-static const char short_options[] = "bd:f:gip:s:uvVx";
+static const char short_options[] = "abd:f:gip:s:uvVx";
 /*
  * Just duplicate per dev options.
  */
@@ -61,6 +61,7 @@ static const char dev_short_options[] = "bgp:";
 char sysfs_mnt_path[SYSFS_PATH_MAX];
 
 static int all_good;
+static int always_info;
 static char *default_callout;
 static int dev_specified;
 static int sys_specified;
@@ -485,6 +486,9 @@ static int set_options(int argc, char **argv, const char *short_opts,
 			dprintf("option '%c'\n", option);
 
 		switch (option) {
+		case 'a':
+			always_info = 1;
+			break;
 		case 'b':
 			all_good = 0;
 			break;
@@ -810,7 +814,7 @@ static int scsi_id(const char *target_path, char *maj_min_dev)
 		retval = 1;
 	} else if (scsi_get_serial(scsi_dev, maj_min_dev, page_code,
 				   serial, MAX_SERIAL_LEN)) {
-		retval = 1;
+		retval = always_info?0:1;
 	} else {
 		retval = 0;
 	}
diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 20a7928553..7bfa9d1812 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -89,6 +89,7 @@ static const char hex_str[]="0123456789abcdef";
 #define SG_ERR_CAT_RESET	2      /* interpreted from sense buffer */
 #define SG_ERR_CAT_TIMEOUT	3
 #define SG_ERR_CAT_RECOVERED	4  /* Successful command after recovered err */
+#define SG_ERR_CAT_NOTSUPPORTED 5 /* Illegal / unsupported command */
 #define SG_ERR_CAT_SENSE	98     /* Something else in the sense buffer */
 #define SG_ERR_CAT_OTHER	99     /* Some other error/warning */
 
@@ -130,6 +131,8 @@ static int sg_err_category_new(int scsi_status, int msg_status, int
 					return SG_ERR_CAT_MEDIA_CHANGED;
 				if (0x29 == asc)
 					return SG_ERR_CAT_RESET;
+			} else if (sense_key == ILLEGAL_REQUEST) {
+				return SG_ERR_CAT_NOTSUPPORTED;
 			}
 		}
 		return SG_ERR_CAT_SENSE;
@@ -331,6 +334,9 @@ resend:
 	retval = sg_err_category3(&io_hdr);
 
 	switch (retval) {
+		case SG_ERR_CAT_NOTSUPPORTED:
+			buf[1] = 0;
+			/* Fallthrough */
 		case SG_ERR_CAT_CLEAN:
 		case SG_ERR_CAT_RECOVERED:
 			retval = 0;
diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index bca80f8de1..f4011ee899 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -72,7 +72,9 @@ static char revision_str[16];
 static char type_str[16];
 
 static int use_usb_info;
+static int use_num_info;
 static int export;
+static int debug;
 
 static void set_str(char *to, const unsigned char *from, int count)
 {
@@ -259,7 +261,7 @@ static int usb_id(const char *target_path)
 	struct sysfs_device *target_dev;
 	struct sysfs_device *host_dev, *interface_dev, *usb_dev;
 	struct sysfs_attribute *scsi_model, *scsi_vendor, *scsi_type, *scsi_rev;
-	struct sysfs_attribute *usb_model, *usb_vendor, *usb_rev, *usb_serial;
+	struct sysfs_attribute *usb_model = NULL, *usb_vendor = NULL, *usb_rev, *usb_serial;
 	struct sysfs_attribute *if_class, *if_subclass;
 	int if_class_num;
 	int protocol = 0;
@@ -322,11 +324,12 @@ static int usb_id(const char *target_path)
 	if_class = sysfs_get_device_attr(interface_dev, "bInterfaceClass");
 	if (!if_class) {
 		info("%s: cannot get bInterfaceClass attribute", interface_dev->name);
-		return -1;
+		return 1;
 	}
 	if_class_num = strtoul(if_class->value, NULL, 16);
 	if (if_class_num != 8) {
 		set_usb_iftype(type_str, if_class->value, sizeof(type_str) - 1);
+		protocol = 0;
 	} else {
 		if_subclass = sysfs_get_device_attr(interface_dev, 
 						    "bInterfaceSubClass");
@@ -338,29 +341,29 @@ static int usb_id(const char *target_path)
 		/* Generic SPC-2 device */
 		scsi_vendor = sysfs_get_device_attr(scsi_dev, "vendor");
 		if (!scsi_vendor) {
-			info("%s: cannot get vendor attribute", scsi_dev->name);
-			return -1;
+			info("%s: cannot get SCSI vendor attribute", scsi_dev->name);
+			return 1;
 		}
 		set_str(vendor_str, scsi_vendor->value, sizeof(vendor_str)-1);
 
 		scsi_model = sysfs_get_device_attr(scsi_dev, "model");
 		if (!scsi_model) {
-			info("%s: cannot get model attribute", scsi_dev->name);
-			return -1;
+			info("%s: cannot get SCSI model attribute", scsi_dev->name);
+			return 1;
 		}
 		set_str(model_str, scsi_model->value, sizeof(model_str)-1);
 
 		scsi_type = sysfs_get_device_attr(scsi_dev, "type");
 		if (!scsi_type) {
-			info("%s: cannot get type attribute", scsi_dev->name);
-			return -1;
+			info("%s: cannot get SCSI type attribute", scsi_dev->name);
+			return 1;
 		}
 		set_scsi_type(type_str, scsi_type->value, sizeof(type_str)-1);
 
 		scsi_rev = sysfs_get_device_attr(scsi_dev, "rev");
 		if (!scsi_rev) {
-			info("%s: cannot get type attribute", scsi_dev->name);
-			return -1;
+			info("%s: cannot get SCSI revision attribute", scsi_dev->name);
+			return 1;
 		}
 		set_str(revision_str, scsi_rev->value, sizeof(revision_str)-1);
 
@@ -368,19 +371,29 @@ static int usb_id(const char *target_path)
 
 	/* Fallback to USB vendor & device */
 	if (vendor_str[0] == '\0') {
-		usb_vendor = sysfs_get_device_attr(usb_dev, "manufacturer");
+		if (!use_num_info)
+			if (!(usb_vendor = sysfs_get_device_attr(usb_dev, "manufacturer")))
+				dbg("No USB vendor string found, using idVendor");
+
 		if (!usb_vendor) {
-			dbg("No USB vendor string found, using idVendor");
-			usb_vendor = sysfs_get_device_attr(usb_dev, "idVendor");
+			if (!(usb_vendor = sysfs_get_device_attr(usb_dev, "idVendor"))) {
+				dbg("No USB vendor information available\n");
+				sprintf(vendor_str,"0000");
+			}
 		}
 		set_str(vendor_str,usb_vendor->value, sizeof(vendor_str) - 1);
 	}
 	
 	if (model_str[0] == '\0') {
-		usb_model = sysfs_get_device_attr(usb_dev, "product");
+		if (!use_num_info)
+			if (!(usb_model = sysfs_get_device_attr(usb_dev, "product")))
+				dbg("No USB model string found, using idProduct");
+		
 		if (!usb_model) {
-			dbg("No USB model string found, using idProduct");
-			usb_model = sysfs_get_device_attr(usb_dev, "idProduct");
+			if (!(usb_model = sysfs_get_device_attr(usb_dev, "idProduct"))) {
+				dbg("No USB model information available\n");
+				sprintf(model_str,"0000");
+			}
 		}
 		set_str(model_str, usb_model->value, sizeof(model_str) - 1);
 	}
@@ -417,13 +430,20 @@ int main(int argc, char **argv)
 		exit(1);
 	}
 
-	while ((option = getopt(argc, argv, "ux")) != -1 ) {
+	while ((option = getopt(argc, argv, "dnux")) != -1 ) {
 		if (optarg)
 			dbg("option '%c' arg '%s'", option, optarg);
 		else
 			dbg("option '%c'", option);
 
 		switch (option) {
+		case 'd':
+			debug = 1;
+			break;
+		case 'n':
+			use_num_info=1;
+			use_usb_info=1;
+			break;
 		case 'u':
 			use_usb_info=1;
 			break;
@@ -432,7 +452,7 @@ int main(int argc, char **argv)
 			break;
 		default:
 			info("Unknown or bad option '%c' (0x%x)", option, option);
-			retval = -1;
+			retval = 1;
 			break;
 		}
 	}
@@ -452,25 +472,27 @@ int main(int argc, char **argv)
 
 	retval = usb_id(target_path);
 
-	if (export) {
-		printf("ID_VENDOR=%s\n", vendor_str);
-		printf("ID_MODEL=%s\n", model_str);
-		printf("ID_REVISION=%s\n", revision_str);
-		if (serial_str[0] == '\0') {
-			printf("ID_SERIAL=%s_%s\n", 
-			       vendor_str, model_str);
-		} else {
-			printf("ID_SERIAL=%s_%s_%s\n", 
-			       vendor_str, model_str, serial_str);
-		}
-		printf("ID_TYPE=%s\n", type_str);
-	} else {
-		if (serial_str[0] == '\0') {
-			printf("%s_%s\n", 
-			       vendor_str, model_str);
+	if (retval == 0) {
+		if (export) {
+			printf("ID_VENDOR=%s\n", vendor_str);
+			printf("ID_MODEL=%s\n", model_str);
+			printf("ID_REVISION=%s\n", revision_str);
+			if (serial_str[0] == '\0') {
+				printf("ID_SERIAL=%s_%s\n", 
+				       vendor_str, model_str);
+			} else {
+				printf("ID_SERIAL=%s_%s_%s\n", 
+				       vendor_str, model_str, serial_str);
+			}
+			printf("ID_TYPE=%s\n", type_str);
 		} else {
-			printf("%s_%s_%s\n", 
-			       vendor_str, model_str, serial_str);
+			if (serial_str[0] == '\0') {
+				printf("%s_%s\n", 
+				       vendor_str, model_str);
+			} else {
+				printf("%s_%s_%s\n", 
+				       vendor_str, model_str, serial_str);
+			}
 		}
 	}
 	exit(retval);
diff --git a/extras/volume_id/README b/extras/volume_id/README
index a7635ff612..974a5016d9 100644
--- a/extras/volume_id/README
+++ b/extras/volume_id/README
@@ -37,7 +37,6 @@ luks                   *      -      *     -
 hpfs                   *      -      -     -
 romfs                  *
 minix                  *
-dasd                   *
 highpoint              *
 isw_raid               *
 lsi_raid               *
diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 451fd355c1..a4a866cfcf 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -32,7 +32,6 @@
 #include "../../udev_utils.h"
 #include "../../logging.h"
 #include "volume_id/volume_id.h"
-#include "volume_id/dasd.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
@@ -136,7 +135,7 @@ int main(int argc, char *argv[])
 
 	vid = volume_id_open_node(node);
 	if (vid == NULL) {
-		fprintf(stderr, "error open volume\n");
+		fprintf(stderr, "%s: error open volume\n", node);
 		rc = 2;
 		goto exit;
 	}
@@ -147,10 +146,8 @@ int main(int argc, char *argv[])
 	if (volume_id_probe_all(vid, 0, size) == 0)
 		goto print;
 
-	if (volume_id_probe_dasd(vid) == 0)
-		goto print;
-
-	fprintf(stderr, "unknown volume type\n");
+	if (print != PRINT_EXPORT)
+		fprintf(stderr, "%s: unknown volume type\n", node);
 	rc = 3;
 	goto exit;
 
diff --git a/extras/volume_id/volume_id/Makefile.inc b/extras/volume_id/volume_id/Makefile.inc
index acd26ff101..266d1e4872 100644
--- a/extras/volume_id/volume_id/Makefile.inc
+++ b/extras/volume_id/volume_id/Makefile.inc
@@ -26,7 +26,6 @@ VOLUME_ID_OBJS=					\
 	$(VOLUME_ID_BASE)/romfs.o		\
 	$(VOLUME_ID_BASE)/sysv.o		\
 	$(VOLUME_ID_BASE)/minix.o		\
-	$(VOLUME_ID_BASE)/dasd.o		\
 	$(VOLUME_ID_BASE)/luks.o		\
 	$(VOLUME_ID_BASE)/volume_id.o		\
 	$(VOLUME_ID_BASE)/util.o
@@ -58,7 +57,6 @@ VOLUME_ID_HEADERS=				\
 	$(VOLUME_ID_BASE)/romfs.h		\
 	$(VOLUME_ID_BASE)/sysv.h		\
 	$(VOLUME_ID_BASE)/minix.h		\
-	$(VOLUME_ID_BASE)/dasd.h		\
 	$(VOLUME_ID_BASE)/luks.h		\
 	$(VOLUME_ID_BASE)/volume_id.h		\
 	$(VOLUME_ID_BASE)/util.h
diff --git a/extras/volume_id/volume_id/dasd.h b/extras/volume_id/volume_id/dasd.h
deleted file mode 100644
index 751b9fda60..0000000000
--- a/extras/volume_id/volume_id/dasd.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * dasdlabel - read label from s390 block device
- *
- * Copyright (C) 2004 Arnd Bergmann <arnd@arndb.de>
- *
- *	This program is free software; you can redistribute it and/or modify it
- *	under the terms of the GNU General Public License as published by the
- *	Free Software Foundation version 2 of the License.
- * 
- *	This program is distributed in the hope that it will be useful, but
- *	WITHOUT ANY WARRANTY; without even the implied warranty of
- *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *	General Public License for more details.
- * 
- *	You should have received a copy of the GNU General Public License along
- *	with this program; if not, write to the Free Software Foundation, Inc.,
- *	675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _VOLUME_ID_DASDLABEL_
-#define _VOLUME_ID_DASDLABEL_
-
-extern int volume_id_probe_dasd(struct volume_id *id);
-
-#endif
diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
index 2266694f5e..c6aef50876 100644
--- a/extras/volume_id/volume_id/volume_id.h
+++ b/extras/volume_id/volume_id/volume_id.h
@@ -21,7 +21,7 @@
 #ifndef _VOLUME_ID_H_
 #define _VOLUME_ID_H_
 
-#define VOLUME_ID_VERSION		44
+#define VOLUME_ID_VERSION		45
 
 #define VOLUME_ID_LABEL_SIZE		64
 #define VOLUME_ID_UUID_SIZE		36