configure: don't check for fadvise

fadvise has been supported since Linux 2.5.60 and glibc 2.2.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Carlos Maiolino <cem@kernel.org>

diff --git a/configure.ac b/configure.ac
index 012508b8e376bc823cbf8441f90916fd086518f0..0b94dab18827defb587f699f4d099f07c7ce8b56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -162,7 +162,6 @@ AC_PACKAGE_NEED_PTHREADMUTEXINIT
 AC_PACKAGE_NEED_URCU_H
 AC_PACKAGE_NEED_RCU_INIT
 
-AC_HAVE_FADVISE
 AC_HAVE_MADVISE
 AC_HAVE_MINCORE
 AC_HAVE_SENDFILE

diff --git a/include/builddefs.in b/include/builddefs.in
index ca5efc9c0d30b014e836cf07366493118018bd00..92ecca62c62eb862c6248ee955f42e446db7995d 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -90,7 +90,6 @@ ENABLE_SCRUB  = @enable_scrub@
 
 HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@
 
-HAVE_FADVISE = @have_fadvise@
 HAVE_MADVISE = @have_madvise@
 HAVE_MINCORE = @have_mincore@
 HAVE_SENDFILE = @have_sendfile@

diff --git a/io/Makefile b/io/Makefile
index 53fef09e899cf32fa9833ddf14f852420a0097af..a8ea640108a2a272588a34401653b17aafe1affd 100644 (file)
--- 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
+       truncate.c utimes.c fadvise.c
 
 LLDLIBS = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBUUID)
 LTDEPENDENCIES = $(LIBXCMD) $(LIBHANDLE) $(LIBFROG)
 LLDFLAGS = -static-libtool-libs
 
-ifeq ($(HAVE_FADVISE),yes)
-CFILES += fadvise.c
-LCFLAGS += -DHAVE_FADVISE
-else
-LSRCFILES += fadvise.c
-endif
-
 ifeq ($(HAVE_MADVISE),yes)
 CFILES += madvise.c
 LCFLAGS += -DHAVE_MADVISE

diff --git a/io/io.h b/io/io.h
index 68e5e4871af70e26e9fd9a6bea0844041ddc996c..19c84b7077723d987aa266203865d3a8ccecba8c 100644 (file)
--- a/io/io.h
+++ b/io/io.h
@@ -116,12 +116,7 @@ extern void                swapext_init(void);
 extern void            sync_init(void);
 extern void            truncate_init(void);
 extern void            utimes_init(void);
-
-#ifdef HAVE_FADVISE
 extern void            fadvise_init(void);
-#else
-#define fadvise_init() do { } while (0)
-#endif
 
 #ifdef HAVE_SENDFILE
 extern void            sendfile_init(void);

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index 5d947a0243c4ac397ed601e7d6280eb28f525d04..53d19a1b603b63021ed5f985157faa3f6fc653d3 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -1,21 +1,3 @@
-# 
-# Check if we have a working fadvise system call
-#
-AC_DEFUN([AC_HAVE_FADVISE],
-  [ AC_MSG_CHECKING([for fadvise ])
-    AC_COMPILE_IFELSE(
-    [  AC_LANG_PROGRAM([[
-#define _GNU_SOURCE
-#include <fcntl.h>
-       ]], [[
-posix_fadvise(0, 1, 0, POSIX_FADV_NORMAL);
-       ]])
-    ], have_fadvise=yes
-       AC_MSG_RESULT(yes),
-       AC_MSG_RESULT(no))
-    AC_SUBST(have_fadvise)
-  ])
-
 #
 # Check if we have a working madvise system call
 #