From 50281e5710dd8cb50208614066ca52ac4574eda6 Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 27 Sep 2022 15:10:04 -0500 Subject: [PATCH] change messages about libblkid features remove message about missing libblkid features change message recommending resize_fsadm when libblkid features are not available. --- lib/device/dev-type.c | 9 --------- lib/metadata/lv_manip.c | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index fb6e9a444..eb9e169bb 100644 --- a/lib/device/dev-type.c +++ b/lib/device/dev-type.c @@ -948,15 +948,6 @@ int fs_get_blkid(const char *pathname, struct fs_info *fsi) blkid_free_probe(probe); - /* We don't expect to get this info for luks */ - if (strcmp(fsi->fstype, "crypto_LUKS") && (no_block_size || no_fslastblock || no_fsblocksize)) { - log_print("Missing libblkid %s%s%sfor %s", - no_block_size ? "BLOCK_SIZE " : "", - no_fslastblock ? "FSLASTBLOCK " : "", - no_fsblocksize ? "FSBLOCKSIZE " : "", - pathname); - } - if (fslastblock && fsblocksize) fsi->fs_last_byte = fslastblock * fsblocksize; diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c index f2ec5d99c..083e54150 100644 --- a/lib/metadata/lv_manip.c +++ b/lib/metadata/lv_manip.c @@ -6024,7 +6024,7 @@ static int _fs_reduce_allow(struct cmd_context *cmd, struct logical_volume *lv, display_lvname(lv), fsi->mount_dir); if (!fsi->fs_last_byte) { - log_error("File system size unknown: update libblkid for FSLASTBLOCK, or see --fs resize_fsadm."); + log_error("File system device usage not available from libblkid, see --fs resize_fsadm."); return 0; }