Decode BLKGETSIZE64 unconditionally

It is available on all supported kernel versions.

* block.c (block_ioctl): Remove #ifdef HAVE_BLKGETSIZE64.
* configure.ac: Remove BLKGETSIZE64 check.

diff --git a/block.c b/block.c
index 5edb9b6f569f667410001485aaac7ff56a2cf471..58e9404fae74f919f00ee5881ae1e1ee74e9bcd5 100644 (file)
--- a/block.c
+++ b/block.c
@@ -204,7 +204,6 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
                printnum_ulong(tcp, arg);
                break;
 
-#ifdef HAVE_BLKGETSIZE64
        /* returns an uint64_t */
        case BLKGETSIZE64:
                if (entering(tcp))
@@ -212,7 +211,6 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
                tprints(", ");
                printnum_int64(tcp, arg, "%" PRIu64);
                break;
-#endif
 
        /* takes a pair of uint64_t */
        case BLKDISCARD:

diff --git a/configure.ac b/configure.ac
index ad1d00fbce7a9c0b57d455c3440e1226fc9d8e3b..c982ced10fdb9c7433a7bf3ca3b3224bc2b182c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -788,15 +788,6 @@ AC_CHECK_MEMBERS(m4_normalize([
 #include <linux/types.h>
 #include <linux/videodev2.h>])
 
-AC_CACHE_CHECK([for BLKGETSIZE64], [ac_cv_have_blkgetsize64],
-       [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
-#include <stdlib.h>
-#include <linux/fs.h>], [return !BLKGETSIZE64;])],
-                          [ac_cv_have_blkgetsize64=yes], [ac_cv_have_blkgetsize64=no])]
-       if test $ac_cv_have_blkgetsize64 = yes; then
-               AC_DEFINE([HAVE_BLKGETSIZE64], [1], [Define to 1 if you have BLKGETSIZE64.])
-       fi)
-
 AC_CHECK_SIZEOF([long])
 SIZEOF_LONG="$ac_cv_sizeof_long"
 AC_SUBST(SIZEOF_LONG)