X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvolume_id%2Fdasd%2Fdasd.c;h=4548190ce2eb5141f3e1b6c3df2d38a060d69872;hp=5623f69d365cd2d1853a67c56f7640466840bdf9;hb=9d4791b66a7756421fc699be51a7be68a5aed329;hpb=e39515ac1fd303c0263ee4bc91f2d7699617d0bf diff --git a/extras/volume_id/volume_id/dasd/dasd.c b/extras/volume_id/volume_id/dasd/dasd.c index 5623f69d3..4548190ce 100644 --- a/extras/volume_id/volume_id/dasd/dasd.c +++ b/extras/volume_id/volume_id/dasd/dasd.c @@ -35,6 +35,7 @@ #include #include "../volume_id.h" +#include "../logging.h" #include "../util.h" #include "dasd.h" @@ -141,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 */ -} dasd_information_t; +} __attribute__((__packed__)) dasd_information_t; #define _IOC_NRBITS 8 #define _IOC_TYPEBITS 8 @@ -168,6 +169,8 @@ int volume_id_probe_dasd_partition(struct volume_id *id) __u8 *label_raw; unsigned char name[7]; + dbg("probing"); + if (ioctl(id->fd, BIODASDINFO, &info) != 0) return -1;