fiemap has been supported since Linux 2.6.28. Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- configure.ac | 1 - include/builddefs.in | 1 - io/Makefile | 9 +-------- io/io.h | 5 ----- m4/package_libcdev.m4 | 21 --------------------- 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/configure.ac b/configure.ac index 3b5ebf375..40999b598 100644 --- a/configure.ac +++ b/configure.ac @@ -163,7 +163,6 @@ AC_PACKAGE_NEED_URCU_H AC_PACKAGE_NEED_RCU_INIT AC_HAVE_FALLOCATE -AC_HAVE_FIEMAP AC_HAVE_PWRITEV2 AC_HAVE_PREADV AC_HAVE_COPY_FILE_RANGE diff --git a/include/builddefs.in b/include/builddefs.in index 353a03d18..a5408014d 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -91,7 +91,6 @@ ENABLE_SCRUB = @enable_scrub@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ HAVE_FALLOCATE = @have_fallocate@ -HAVE_FIEMAP = @have_fiemap@ HAVE_PREADV = @have_preadv@ HAVE_PWRITEV2 = @have_pwritev2@ HAVE_COPY_FILE_RANGE = @have_copy_file_range@ diff --git a/io/Makefile b/io/Makefile index f480272ae..2271389f5 100644 --- a/io/Makefile +++ b/io/Makefile @@ -13,19 +13,12 @@ CFILES = init.c \ file.c freeze.c fsuuid.c fsync.c getrusage.c imap.c inject.c label.c \ link.c mmap.c open.c parent.c pread.c prealloc.c pwrite.c reflink.c \ resblks.c scrub.c seek.c shutdown.c stat.c swapext.c sync.c \ - truncate.c utimes.c fadvise.c sendfile.c madvise.c mincore.c + truncate.c utimes.c fadvise.c sendfile.c madvise.c mincore.c fiemap.c LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUUID) LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) LLDFLAGS = -static-libtool-libs -ifeq ($(HAVE_FIEMAP),yes) -CFILES += fiemap.c -LCFLAGS += -DHAVE_FIEMAP -else -LSRCFILES += fiemap.c -endif - ifeq ($(HAVE_COPY_FILE_RANGE),yes) CFILES += copy_file_range.c LCFLAGS += -DHAVE_COPY_FILE_RANGE diff --git a/io/io.h b/io/io.h index 9c056efb5..982d37c38 100644 --- a/io/io.h +++ b/io/io.h @@ -120,12 +120,7 @@ extern void fadvise_init(void); extern void sendfile_init(void); extern void madvise_init(void); extern void mincore_init(void); - -#ifdef HAVE_FIEMAP extern void fiemap_init(void); -#else -#define fiemap_init() do { } while (0) -#endif #ifdef HAVE_COPY_FILE_RANGE extern void copy_range_init(void); diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4 index 87c294b24..93daf3640 100644 --- a/m4/package_libcdev.m4 +++ b/m4/package_libcdev.m4 @@ -17,27 +17,6 @@ fallocate(0, 0, 0, 0); AC_SUBST(have_fallocate) ]) -# -# Check if we have the fiemap ioctl (Linux) -# -AC_DEFUN([AC_HAVE_FIEMAP], - [ AC_MSG_CHECKING([for fiemap]) - AC_LINK_IFELSE( - [ AC_LANG_PROGRAM([[ -#define _GNU_SOURCE -#include <linux/fs.h> -#include <linux/fiemap.h> -#include <sys/ioctl.h> - ]], [[ -struct fiemap *fiemap; -ioctl(0, FS_IOC_FIEMAP, (unsigned long)fiemap); - ]]) - ], have_fiemap=yes - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - AC_SUBST(have_fiemap) - ]) - # # Check if we have a preadv libc call (Linux) # -- 2.39.2