X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fdasd%2Fdasd.c;h=2df6a09e8106a460ce6337cdf65feae2c73b1c18;hb=866bb54704e9d955318e0dd6089acfb67d36bfd2;hp=4548190ce2eb5141f3e1b6c3df2d38a060d69872;hpb=1d62f6e2decfe9085ea9c054a4d327adc8203e94;p=elogind.git diff --git a/extras/volume_id/volume_id/dasd/dasd.c b/extras/volume_id/volume_id/dasd/dasd.c index 4548190ce..2df6a09e8 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;