diff options
| author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2005-02-10 05:51:41 +0100 |
|---|---|---|
| committer | Greg KH <gregkh@suse.de> | 2005-04-26 23:31:02 -0700 |
| commit | 866bb54704e9d955318e0dd6089acfb67d36bfd2 (patch) | |
| tree | a2aa7e04c2adfa61380fd9a12be9a289af057e22 | |
| parent | 1d62f6e2decfe9085ea9c054a4d327adc8203e94 (diff) | |
[PATCH] udev_volume_id: remove __packed__ from dasd structure as it does not work
| -rw-r--r-- | extras/volume_id/udev_volume_id.c | 2 | ||||
| -rw-r--r-- | extras/volume_id/volume_id/dasd/dasd.c | 4 | ||||
| -rw-r--r-- | extras/volume_id/volume_id/dasd/dasd.h | 2 | ||||
| -rw-r--r-- | udev_utils.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/extras/volume_id/udev_volume_id.c b/extras/volume_id/udev_volume_id.c index d3c3fcd505..f04f374c27 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 4548190ce2..2df6a09e81 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 e7918948c9..751b9fda60 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 ca46258def..fda1f42f7e 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) { |