diff options
| author | Karel Zak | 2019-07-15 11:37:17 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-07-15 11:37:17 +0200 |
| commit | 6744302ce5b23ef19d7cfaa20cb53d27642ea8ac (patch) | |
| tree | cf0b984c0ecc6b52e39caf2e39d7f4cc6f9b252a /libblkid/src/superblocks/zfs.c | |
| parent | build-sys: Include <stdlib.h> in ./configure wchar_t test (diff) | |
| parent | libblkid: fix address sanitizer issues (diff) | |
| download | kernel-qcow2-util-linux-6744302ce5b23ef19d7cfaa20cb53d27642ea8ac.tar.gz kernel-qcow2-util-linux-6744302ce5b23ef19d7cfaa20cb53d27642ea8ac.tar.xz kernel-qcow2-util-linux-6744302ce5b23ef19d7cfaa20cb53d27642ea8ac.zip | |
Merge branch '2019wk27' of https://github.com/kerolasa/util-linux
* '2019wk27' of https://github.com/kerolasa/util-linux:
libblkid: fix address sanitizer issues
libblkid: check number of test_blkid_save arguments correctly
include/xalloc: ensure xstrdup() and xstrndup() returns nonnull attribute
libmount: fix potential null pointer dereference
libfdisk: fix variable shadowing
lib/ttyutils: avoid checking same thing twice
Diffstat (limited to 'libblkid/src/superblocks/zfs.c')
| -rw-r--r-- | libblkid/src/superblocks/zfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |