shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-30 14:55:26 +03:00
Code

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

Browse Source
This commit is contained in:
kay.sievers@vrfy.org 2005-02-10 05:51:41 +01:00 committed by Greg KH
parent 1d62f6e2de
commit 866bb54704
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/volume_id/udev_volume_id.c
View File

@ -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;
}

4
extras/volume_id/volume_id/dasd/dasd.c
View File

@ -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;

2
extras/volume_id/volume_id/dasd/dasd.h
View File

@ -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

2
udev_utils.c
View File

@ -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)
{