From: Disha Goel <disgoel@linux.ibm.com>
To: fstests@vger.kernel.org, djwong@kernel.org
Cc: ojaswin@linux.ibm.com, ritesh.list@gmail.com,
Disha Goel <disgoel@linux.ibm.com>
Subject: [PATCH v2] xfstest: add detection for ext4.h presence in configure.ac
Date: Thu, 4 Jan 2024 00:12:08 +0530 [thread overview]
Message-ID: <20240103184208.80772-1-disgoel@linux.ibm.com> (raw)
In some distributions, __u64 is already defined in system header files,
causing compilation errors when building xfstest.
# make
[CC] ext4_resize
ext4_resize.c:17:28: error: conflicting types for '__u64'
typedef unsigned long long __u64;
^~~~~
In file included from /usr/include/asm/types.h:26:0,
from /usr/include/linux/types.h:5,
from /usr/include/linux/mount.h:4,
from /usr/include/sys/mount.h:32,
from ext4_resize.c:15:
/usr/include/asm-generic/int-l64.h:30:23: note: previous declaration of '__u64' was here
typedef unsigned long __u64;
^~~~~
To address this issue, configure.ac now checks for the presence
and compilability of <linux/ext4.h>. If found and compilable, the
macro HAVE_LINUX_EXT4_H is defined. If not, a warning message
is displayed. The commit also updates src/ext4_resize.c to
conditionally include <linux/ext4.h> based on the presence of
the header, ensuring compatibility with systems where ext4.h
is either present or not. This change enhances the configure
process and improves code consistency.
The changes were tested on various distributions on Power
architecture, by successfully compiling xfstest. Additionally,
verified the compatibility by running ext4/033 and ext4/056
tests, both of which use ext4_resize and observed successful
test execution.
# make
[CC] detached_mounts_propagation
[CC] ext4_resize
[CC] t_readdir_3
Signed-off-by: Disha Goel <disgoel@linux.ibm.com>
---
Changelog:
v1 -> v2
Drop usage of uint64_t to match the definition in the kernel uapi
headers. Use <linux/ext4.h> or <linux/types.h> based on the
presence of the header to get the __u64 definition as suggested
by Darrick.
Link to v1:
https://lore.kernel.org/fstests/20231221061231.44347-1-disgoel@linux.ibm.com/T/#u
configure.ac | 8 ++++++++
src/ext4_resize.c | 6 +++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b22fc52b..76378e6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,14 @@ AC_CHECK_HEADERS([ assert.h \
sys/mman.h \
])
+AC_COMPILE_IFELSE([
+ AC_LANG_PROGRAM([#include <linux/ext4.h>], [])
+], [
+ AC_DEFINE([HAVE_LINUX_EXT4_H], [1], [Define if ext4.h is present])
+], [
+ AC_MSG_WARN([ext4.h not found or not compilable.])
+])
+
AC_CHECK_HEADERS([xfs/xfs_log_format.h],,,[
#define _GNU_SOURCE
#include <xfs/libxfs.h>])
diff --git a/src/ext4_resize.c b/src/ext4_resize.c
index 78b66432..51bd8d78 100644
--- a/src/ext4_resize.c
+++ b/src/ext4_resize.c
@@ -14,7 +14,11 @@
#include <sys/ioctl.h>
#include <sys/mount.h>
-typedef unsigned long long __u64;
+#ifdef HAVE_LINUX_EXT4_H
+#include <linux/ext4.h>
+#else
+#include <linux/types.h>
+#endif
#ifndef EXT4_IOC_RESIZE_FS
#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64)
--
2.39.1
next reply other threads:[~2024-01-03 18:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 18:42 Disha Goel [this message]
2024-01-04 18:12 ` [PATCH v2] xfstest: add detection for ext4.h presence in configure.ac Darrick J. Wong
2024-01-09 11:15 ` Disha Goel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240103184208.80772-1-disgoel@linux.ibm.com \
--to=disgoel@linux.ibm.com \
--cc=djwong@kernel.org \
--cc=fstests@vger.kernel.org \
--cc=ojaswin@linux.ibm.com \
--cc=ritesh.list@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox