chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udev_volume_id: remove __packed__ from dasd structure as it does not work
[elogind.git]
/
extras
/
volume_id
/
volume_id
/
dasd
/
dasd.c
diff --git
a/extras/volume_id/volume_id/dasd/dasd.c
b/extras/volume_id/volume_id/dasd/dasd.c
index 4548190ce2eb5141f3e1b6c3df2d38a060d69872..2df6a09e8106a460ce6337cdf65feae2c73b1c18 100644
(file)
--- 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 */
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
#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)
#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;
{
int blocksize;
dasd_information_t info;