diff options
Diffstat (limited to 'libblkid/src')
-rw-r--r-- | libblkid/src/save.c | 2 | ||||
-rw-r--r-- | libblkid/src/superblocks/drbd.c | 2 | ||||
-rw-r--r-- | libblkid/src/superblocks/zfs.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libblkid/src/save.c b/libblkid/src/save.c index 21308a9cf..bceaa1139 100644 --- a/libblkid/src/save.c +++ b/libblkid/src/save.c @@ -213,7 +213,7 @@ int main(int argc, char **argv) int ret; blkid_init_debug(BLKID_DEBUG_ALL); - if (argc > 2) { + if (argc != 2) { fprintf(stderr, "Usage: %s [filename]\n" "Test loading/saving a cache (filename)\n", argv[0]); exit(1); diff --git a/libblkid/src/superblocks/drbd.c b/libblkid/src/superblocks/drbd.c index 4ebaf1739..c27a8b384 100644 --- a/libblkid/src/superblocks/drbd.c +++ b/libblkid/src/superblocks/drbd.c @@ -109,7 +109,7 @@ struct meta_data_on_disk_9 { struct peer_dev_md_on_disk_9 peers[DRBD_PEERS_MAX]; uint64_t history_uuids[HISTORY_UUIDS]; - char padding[0] __attribute__((aligned(4096))); + uint8_t padding[2704]; } __attribute__((packed)); diff --git a/libblkid/src/superblocks/zfs.c b/libblkid/src/superblocks/zfs.c index 4d4b46d55..0af14fb65 100644 --- a/libblkid/src/superblocks/zfs.c +++ b/libblkid/src/superblocks/zfs.c @@ -58,7 +58,7 @@ struct nvuint64 { uint32_t nvu_type; uint32_t nvu_elem; uint64_t nvu_value; -}; +} __attribute__((packed)); struct nvlist { uint32_t nvl_unknown[3]; |