FS/XFS testing framework
 help / color / mirror / Atom feed
From: Gao Xiang <hsiangkao@linux.alibaba.com>
To: fstests@vger.kernel.org
Cc: Gao Xiang <hsiangkao@linux.alibaba.com>,
	Christian Brauner <brauner@kernel.org>,
	"Yang Xu (Fujitsu)" <xuyang2018.jy@fujitsu.com>
Subject: [PATCH v2] src: fix detached_mounts_propagation compile errors
Date: Thu, 20 Apr 2023 10:11:06 +0800	[thread overview]
Message-ID: <20230420021106.41970-1-hsiangkao@linux.alibaba.com> (raw)
In-Reply-To: <20230419032955.114278-1-hsiangkao@linux.alibaba.com>

Newer glibc such as glibc 2.36 also defines 'struct mount_attr'
in addition to <linux/mount.h>.  It will report as below when
compiling with old linux kernel headers (without idmapped mounts,
such as kernel-headers 5.10.134) but with newer glibc (here checked
with glibc 2.36.6):

    [CC]    detached_mounts_propagation
In file included from detached_mounts_propagation.c:29:
vfs/missing.h:115:8: error: redefinition of 'struct mount_attr'
  115 | struct mount_attr {
      |        ^~~~~~~~~~
In file included from detached_mounts_propagation.c:23:
/usr/include/sys/mount.h:210:8: note: originally defined here
  210 | struct mount_attr
      |        ^~~~~~~~~~
gmake[3]: *** [Makefile:102: detached_mounts_propagation] Error 1
gmake[2]: *** [include/buildrules:31: src] Error 2
make[1]: *** [Makefile:51: default] Error 2
make: *** [Makefile:49: default] Error 2

Let's get rid of <linux/mount.h> as Christian suggested to avoid
potential incompatibility between these two headers.

Cc: Christian Brauner <brauner@kernel.org>
Cc: "Yang Xu (Fujitsu)" <xuyang2018.jy@fujitsu.com>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
---
 configure.ac                      | 2 +-
 src/detached_mounts_propagation.c | 1 -
 src/vfs/missing.h                 | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4687d8a3..bb29f37e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,7 +74,7 @@ AC_HAVE_FIEXCHANGE
 
 AC_CHECK_FUNCS([renameat2])
 AC_CHECK_FUNCS([reallocarray])
-AC_CHECK_TYPES([struct mount_attr], [], [], [[#include <linux/mount.h>]])
+AC_CHECK_TYPES([struct mount_attr], [], [], [[#include <sys/mount.h>]])
 AC_CHECK_TYPES([struct btrfs_qgroup_limit], [], [], [[
 #include <stddef.h>
 #include <linux/btrfs.h>
diff --git a/src/detached_mounts_propagation.c b/src/detached_mounts_propagation.c
index 17db2c02..4041c75f 100644
--- a/src/detached_mounts_propagation.c
+++ b/src/detached_mounts_propagation.c
@@ -20,7 +20,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
diff --git a/src/vfs/missing.h b/src/vfs/missing.h
index 059e742d..04ab33d1 100644
--- a/src/vfs/missing.h
+++ b/src/vfs/missing.h
@@ -18,6 +18,7 @@
 #include <sys/types.h>
 #include <syscall.h>
 #include <unistd.h>
+#include <sys/mount.h>
 
 #ifndef __NR_mount_setattr
 	#if defined __alpha__
-- 
2.24.4


  parent reply	other threads:[~2023-04-20  2:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-19  3:29 [PATCH] src: fix detached_mounts_propagation compile errors Gao Xiang
2023-04-19  8:45 ` Christian Brauner
2023-04-19  9:04   ` Gao Xiang
2023-04-19  9:08   ` Yang Xu (Fujitsu)
2023-04-20  2:11 ` Gao Xiang [this message]
2023-04-20  8:42   ` [PATCH v2] " Christian Brauner
2023-04-22 13:54   ` Zorro Lang
2023-04-24  3:13     ` Gao Xiang
2023-04-24 10:17     ` Ziyang Zhang
2023-04-24 21:06       ` Zorro Lang
2023-04-25  1:28         ` Yang Xu (Fujitsu)
2023-04-25  1:59           ` Ziyang Zhang
2023-04-25  2:07             ` Yang Xu (Fujitsu)
2023-04-25  3:18               ` Ziyang Zhang

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=20230420021106.41970-1-hsiangkao@linux.alibaba.com \
    --to=hsiangkao@linux.alibaba.com \
    --cc=brauner@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=xuyang2018.jy@fujitsu.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