We can't support block device access (which is the reason for xfsprogs
to exist) without blkid. Make it a hard requirement and remove the
stubs.
Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
---
configure.ac | 8 --------
include/builddefs.in | 4 ----
libxfs/topology.c | 37 +------------------------------------
3 files changed, 1 insertion(+), 48 deletions(-)
diff --git a/configure.ac b/configure.ac
index 228e89a50..012508b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,11 +36,6 @@ AC_ARG_ENABLE(gettext,
enable_gettext=yes)
AC_SUBST(enable_gettext)
-AC_ARG_ENABLE(blkid,
-[ --enable-blkid=[yes/no] Enable use of block device id library [default=yes]],,
- enable_blkid=yes)
-AC_SUBST(enable_blkid)
-
AC_ARG_ENABLE(editline,
[ --enable-editline=[yes/no] Enable editline command editing [default=no]],
test $enable_editline = yes && libeditline="-ledit",
@@ -208,10 +203,7 @@ AC_HAVE_HDIO_GETGEO
AC_CONFIG_SYSTEMD_SYSTEM_UNIT_DIR
AC_CONFIG_CROND_DIR
AC_CONFIG_UDEV_RULE_DIR
-
-if test "$enable_blkid" = yes; then
AC_HAVE_BLKID_TOPO
-fi
if test "$enable_ubsan" = "yes" || test "$enable_ubsan" = "probe"; then
AC_PACKAGE_CHECK_UBSAN
diff --git a/include/builddefs.in b/include/builddefs.in
index b5bfbb1f2..a00283da1 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -86,7 +86,6 @@ RPM_VERSION = @rpm_version@
ENABLE_SHARED = @enable_shared@
ENABLE_GETTEXT = @enable_gettext@
ENABLE_EDITLINE = @enable_editline@
-ENABLE_BLKID = @enable_blkid@
ENABLE_SCRUB = @enable_scrub@
HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
@@ -144,9 +143,6 @@ endif
ifeq ($(HAVE_FSETXATTR),yes)
PCFLAGS+= -DHAVE_FSETXATTR
endif
-ifeq ($(ENABLE_BLKID),yes)
-PCFLAGS+= -DENABLE_BLKID
-endif
ifeq ($(NEED_INTERNAL_FSXATTR),yes)
PCFLAGS+= -DOVERRIDE_SYSTEM_FSXATTR
endif
diff --git a/libxfs/topology.c b/libxfs/topology.c
index 06013d429..4515d238d 100644
--- a/libxfs/topology.c
+++ b/libxfs/topology.c
@@ -6,9 +6,7 @@
#include "libxfs_priv.h"
#include "libxcmd.h"
-#ifdef ENABLE_BLKID
-# include <blkid/blkid.h>
-#endif /* ENABLE_BLKID */
+#include <blkid/blkid.h>
#include "xfs_multidisk.h"
#include "libfrog/platform.h"
@@ -96,7 +94,6 @@ done:
* 0 for nothing found
* -1 for internal error
*/
-#ifdef ENABLE_BLKID
int
check_overwrite(
const char *device)
@@ -253,38 +250,6 @@ out_free_probe:
_("warning: unable to probe device topology for device %s\n"),
device);
}
-#else /* ifdef ENABLE_BLKID */
-/*
- * Without blkid, we can't do a good check for signatures.
- * So instead of some messy attempts, just disable any checks
- * and always return 'nothing found'.
- */
-# warning BLKID is disabled, so signature detection and block device\
- access are not working!
-int
-check_overwrite(
- const char *device)
-{
- return 1;
-}
-
-static void blkid_get_topology(
- const char *device,
- int *sunit,
- int *swidth,
- int *lsectorsize,
- int *psectorsize,
- int force_overwrite)
-{
- /*
- * Shouldn't make any difference (no blkid = no block device access),
- * but make sure this dummy replacement returns with at least some
- * sanity.
- */
- *lsectorsize = *psectorsize = 512;
-}
-
-#endif /* ENABLE_BLKID */
void
get_topology(
--
2.39.2
