From: kay.sievers@vrfy.org <kay.sievers@vrfy.org>
Date: Thu, 10 Feb 2005 04:51:41 +0000 (+0100)
Subject: [PATCH] udev_volume_id: remove __packed__ from dasd structure as it does not work
X-Git-Tag: 053~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=866bb54704e9d955318e0dd6089acfb67d36bfd2;p=systemd

[PATCH] udev_volume_id: remove __packed__ from dasd structure as it does not work
---

diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c
index d3c3fcd5..f04f374c 100644
--- a/extras/volume_id/udev_volume_id.c
+++ b/extras/volume_id/udev_volume_id.c
@@ -166,7 +166,7 @@ int main(int argc, char *argv[])
 		if (vid == NULL)
 			goto exit;
 
-		if (volume_id_probe_dasd_partition(vid) == 0)
+		if (volume_id_probe_dasd(vid) == 0)
 			goto print;
 	}
 
diff --git a/extras/volume_id/volume_id/dasd/dasd.c b/extras/volume_id/volume_id/dasd/dasd.c
index 4548190c..2df6a09e 100644
--- a/extras/volume_id/volume_id/dasd/dasd.c
+++ b/extras/volume_id/volume_id/dasd/dasd.c
@@ -142,7 +142,7 @@ typedef struct dasd_information_t {
 	unsigned int confdata_size;
 	char characteristics[64];	/* from read_device_characteristics */
 	char configuration_data[256];	/* from read_configuration_data */
-} __attribute__((__packed__)) dasd_information_t;
+} dasd_information_t;
 
 #define _IOC_NRBITS		8
 #define _IOC_TYPEBITS		8
@@ -161,7 +161,7 @@ typedef struct dasd_information_t {
 #define BIODASDINFO _IOR(DASD_IOCTL_LETTER,1,dasd_information_t)
 #define BLKSSZGET _IO(0x12,104)
 
-int volume_id_probe_dasd_partition(struct volume_id *id)
+int volume_id_probe_dasd(struct volume_id *id)
 {
 	int blocksize;
 	dasd_information_t info;
diff --git a/extras/volume_id/volume_id/dasd/dasd.h b/extras/volume_id/volume_id/dasd/dasd.h
index e7918948..751b9fda 100644
--- a/extras/volume_id/volume_id/dasd/dasd.h
+++ b/extras/volume_id/volume_id/dasd/dasd.h
@@ -21,6 +21,6 @@
 #ifndef _VOLUME_ID_DASDLABEL_
 #define _VOLUME_ID_DASDLABEL_
 
-extern int volume_id_probe_dasd_partition(struct volume_id *id);
+extern int volume_id_probe_dasd(struct volume_id *id);
 
 #endif
diff --git a/udev_utils.c b/udev_utils.c
index ca46258d..fda1f42f 100644
--- a/udev_utils.c
+++ b/udev_utils.c
@@ -113,7 +113,7 @@ int create_path(const char *path)
 }
 
 /* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed to.
+ * that permisions of possible hard links will be removed too.
  */
 int unlink_secure(const char *filename)
 {