diff options
| author | David Teigland <teigland@redhat.com> | 2022-09-29 15:25:32 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2022-09-29 15:25:32 -0500 |
| commit | b09de683c72b62167fbbd64491708ede652c32a1 (patch) | |
| tree | 481b5232d86a7e7fb88c85b6a4987c97f0d874ad | |
| parent | 5a0052a1d3b06a071ff6197fc41d9fa312827538 (diff) | |
| download | lvm2-b09de683c72b62167fbbd64491708ede652c32a1.tar.gz | |
blkid: fix BLKID_SUBLKS_FSINFO usage
Use this flag for all fs info lookups, including BLOCK_SIZE,
if it is defined in blkid.h.
| -rw-r--r-- | lib/device/dev-type.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index bb8925483..8b51a672a 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -25,12 +25,7 @@ #include "device_mapper/misc/dm-ioctl.h" #ifdef BLKID_WIPING_SUPPORT -#include <blkid.h> -/* - * FIXME: recent addition to blkid.h copied here. - * Remove this and require a recent libblkid version from configure. - */ -#define BLKID_SUBLKS_FSINFO (1 << 11) /* read and define fs properties from superblock */ +#include <blkid/blkid.h> #endif #ifdef UDEV_SYNC_SUPPORT @@ -847,6 +842,9 @@ int fs_block_size_and_type(const char *pathname, uint32_t *fs_block_size_bytes, BLKID_SUBLKS_UUID | BLKID_SUBLKS_UUIDRAW | BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE | BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION | +#ifdef BLKID_SUBLKS_FSINFO + BLKID_SUBLKS_FSINFO | +#endif BLKID_SUBLKS_MAGIC); rc = blkid_do_safeprobe(probe); if (rc < 0) { @@ -906,7 +904,10 @@ int fs_get_blkid(const char *pathname, struct fs_info *fsi) BLKID_SUBLKS_UUID | BLKID_SUBLKS_UUIDRAW | BLKID_SUBLKS_TYPE | BLKID_SUBLKS_SECTYPE | BLKID_SUBLKS_USAGE | BLKID_SUBLKS_VERSION | - BLKID_SUBLKS_MAGIC | BLKID_SUBLKS_FSINFO); +#ifdef BLKID_SUBLKS_FSINFO + BLKID_SUBLKS_FSINFO | +#endif + BLKID_SUBLKS_MAGIC); rc = blkid_do_safeprobe(probe); if (rc < 0) { log_error("Failed libblkid probe for %s", pathname); |