diff options
| author | Karel Zak | 2019-01-02 14:20:21 +0100 |
|---|---|---|
| committer | Karel Zak | 2019-01-02 14:20:21 +0100 |
| commit | 2d6cad08cf74dc5d7323c973a32d3c67150c89a9 (patch) | |
| tree | 2d39d98bb4327cdcd14d15819dc30fe4392769d1 | |
| parent | Remove duplicate entry for reset-env from usage (diff) | |
| parent | Removed BlueStore VERSION information as it is gibberish (diff) | |
| download | kernel-qcow2-util-linux-2d6cad08cf74dc5d7323c973a32d3c67150c89a9.tar.gz kernel-qcow2-util-linux-2d6cad08cf74dc5d7323c973a32d3c67150c89a9.tar.xz kernel-qcow2-util-linux-2d6cad08cf74dc5d7323c973a32d3c67150c89a9.zip | |
Merge branch 'master' of https://github.com/kvanals/util-linux
* 'master' of https://github.com/kvanals/util-linux:
Removed BlueStore VERSION information as it is gibberish
Updated BlueStore expected result
Added BlueStore test image
| -rw-r--r-- | libblkid/src/superblocks/bluestore.c | 2 | ||||
| -rw-r--r-- | tests/expected/blkid/low-probe-bluestore | 2 | ||||
| -rw-r--r-- | tests/ts/blkid/images-fs/bluestore.img.xz | bin | 0 -> 412 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/libblkid/src/superblocks/bluestore.c b/libblkid/src/superblocks/bluestore.c index 318aa9fd1..7fcd11da6 100644 --- a/libblkid/src/superblocks/bluestore.c +++ b/libblkid/src/superblocks/bluestore.c @@ -27,7 +27,6 @@ struct bluestore_phdr { uint8_t magic[BLUESTORE_MAGIC_L]; - uint32_t version; } __attribute__((packed)); static int probe_bluestore(blkid_probe pr, const struct blkid_idmag *mag) @@ -38,7 +37,6 @@ static int probe_bluestore(blkid_probe pr, const struct blkid_idmag *mag) if (header == NULL) return errno ? -errno : 1; - blkid_probe_sprintf_version(pr, "%u", le32_to_cpu(header->version)); return 0; } diff --git a/tests/expected/blkid/low-probe-bluestore b/tests/expected/blkid/low-probe-bluestore new file mode 100644 index 000000000..006d4022b --- /dev/null +++ b/tests/expected/blkid/low-probe-bluestore @@ -0,0 +1,2 @@ +ID_FS_TYPE=ceph_bluestore +ID_FS_USAGE=other diff --git a/tests/ts/blkid/images-fs/bluestore.img.xz b/tests/ts/blkid/images-fs/bluestore.img.xz Binary files differnew file mode 100644 index 000000000..4fd8cbde6 --- /dev/null +++ b/tests/ts/blkid/images-fs/bluestore.img.xz |