aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2024-02-15 07:54:08 +0100
committerCarlos Maiolino <cem@kernel.org>2024-03-13 08:48:37 +0100
commit04e3bb974e09a5cf2d46efd21523f414bfb592f3 (patch)
treeb6f76b59b71fabed7600011ed03d0ef57f7ded7e
parent1b8d539cc26726afbc032d906a2ee4be5068fba4 (diff)
downloadxfsprogs-dev-04e3bb974e09a5cf2d46efd21523f414bfb592f3.tar.gz
configure: don't check for sendfile
sendfile has been supported since Linux 2.2 and glibc 2.1. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: "Darrick J. Wong" <djwong@kernel.org> Signed-off-by: Carlos Maiolino <cem@kernel.org>
-rw-r--r--configure.ac1
-rw-r--r--include/builddefs.in1
-rw-r--r--io/Makefile9
-rw-r--r--io/io.h5
-rw-r--r--m4/package_libcdev.m418
5 files changed, 1 insertions, 33 deletions
diff --git a/configure.ac b/configure.ac
index 0b94dab188..871dc5cf12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,6 @@ AC_PACKAGE_NEED_RCU_INIT
AC_HAVE_MADVISE
AC_HAVE_MINCORE
-AC_HAVE_SENDFILE
AC_HAVE_FALLOCATE
AC_HAVE_FIEMAP
AC_HAVE_PWRITEV2
diff --git a/include/builddefs.in b/include/builddefs.in
index 92ecca62c6..eaf555fb3b 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -92,7 +92,6 @@ HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
HAVE_MADVISE = @have_madvise@
HAVE_MINCORE = @have_mincore@
-HAVE_SENDFILE = @have_sendfile@
HAVE_FALLOCATE = @have_fallocate@
HAVE_FIEMAP = @have_fiemap@
HAVE_PREADV = @have_preadv@
diff --git a/io/Makefile b/io/Makefile
index a8ea640108..9309f1a4ff 100644
--- a/io/Makefile
+++ b/io/Makefile
@@ -13,7 +13,7 @@ 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
+ truncate.c utimes.c fadvise.c sendfile.c
LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUUID)
LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG)
@@ -33,13 +33,6 @@ else
LSRCFILES += mincore.c
endif
-ifeq ($(HAVE_SENDFILE),yes)
-CFILES += sendfile.c
-LCFLAGS += -DHAVE_SENDFILE
-else
-LSRCFILES += sendfile.c
-endif
-
ifeq ($(HAVE_FIEMAP),yes)
CFILES += fiemap.c
LCFLAGS += -DHAVE_FIEMAP
diff --git a/io/io.h b/io/io.h
index 19c84b7077..56e6159b0d 100644
--- a/io/io.h
+++ b/io/io.h
@@ -117,12 +117,7 @@ extern void sync_init(void);
extern void truncate_init(void);
extern void utimes_init(void);
extern void fadvise_init(void);
-
-#ifdef HAVE_SENDFILE
extern void sendfile_init(void);
-#else
-#define sendfile_init() do { } while (0)
-#endif
#ifdef HAVE_MADVISE
extern void madvise_init(void);
diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 53d19a1b60..ef20ae41ae 100644
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -35,24 +35,6 @@ mincore(0, 0, 0);
])
#
-# Check if we have a working sendfile system call
-#
-AC_DEFUN([AC_HAVE_SENDFILE],
- [ AC_MSG_CHECKING([for sendfile ])
- AC_COMPILE_IFELSE(
- [ AC_LANG_PROGRAM([[
-#define _GNU_SOURCE
-#include <sys/sendfile.h>
- ]], [[
-sendfile(0, 0, 0, 0);
- ]])
- ], have_sendfile=yes
- AC_MSG_RESULT(yes),
- AC_MSG_RESULT(no))
- AC_SUBST(have_sendfile)
- ])
-
-#
# Check if we have a fallocate libc call (Linux)
#
AC_DEFUN([AC_HAVE_FALLOCATE],