[trafficserver] branch master updated: Change linux/fs include to build with glibc 2.36 (#9027)

[bn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new ae9143aac Change linux/fs include to build with glibc 2.36 (#9027)
ae9143aac is described below

commit ae9143aac98a9b340e157291506137ebc1f5dd70
Author: Jered Floyd <je...@redhat.com>
AuthorDate: Thu Aug 11 16:38:15 2022 -0400

    Change linux/fs include to build with glibc 2.36 (#9027)
---
 configure.ac           | 4 ++--
 src/tscore/ink_file.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3e9b7871b..df4623d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1902,8 +1902,8 @@ AC_CHECK_HEADERS([sys/types.h \
 
 # On OpenBSD, pthread.h must be included before pthread_np.h
 AC_CHECK_HEADERS([pthread_np.h], [], [], [#include <pthread.h>])
-AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h])
-AC_CHECK_HEADERS([linux/hdreg.h linux/fs.h linux/major.h])
+AC_CHECK_HEADERS([sys/statfs.h sys/statvfs.h sys/disk.h sys/disklabel.h sys/mount.h])
+AC_CHECK_HEADERS([linux/hdreg.h linux/major.h])
 
 AC_CHECK_HEADERS([sys/sysctl.h], [], [],
                  [[#ifdef HAVE_SYS_PARAM_H
diff --git a/src/tscore/ink_file.cc b/src/tscore/ink_file.cc
index 37995b0be..6e960aaa7 100644
--- a/src/tscore/ink_file.cc
+++ b/src/tscore/ink_file.cc
@@ -52,8 +52,8 @@
 #include <linux/hdreg.h> /* for struct hd_geometry */
 #endif
 
-#if HAVE_LINUX_FS_H
-#include <linux/fs.h> /* for BLKGETSIZE.  sys/mount.h is another candidate */
+#if HAVE_SYS_MOUNT_H
+#include <sys/mount.h> /* for BLKGETSIZE */
 #endif
 
 using ioctl_arg_t = union {