| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | From dd43cbc7f50266cdc6210f2b920d7f648a83bdd6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 14 Aug 2022 13:33:05 -0700 |
| 4 | Subject: [PATCH 2/2] Drop detached_mounts_propagation and remove sys/mount.h |
| 5 | from vfs/utils.c |
| 6 | |
| 7 | with glibc 2.36+ sys/mount.h conflicts with linux/mount.h and here |
| 8 | linux/mount.h is included via xfs/xfs.h header and we need sys/mount.h |
| 9 | for the mount() API prototype. Until thats resolved lets not build this |
| 10 | testcase |
| 11 | |
| 12 | Upstream-Status: Inappropriate [Libc specific Workaround] |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | src/Makefile | 2 +- |
| 17 | src/vfs/utils.c | 1 - |
| 18 | 2 files changed, 1 insertion(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/src/Makefile b/src/Makefile |
| 21 | index 665edcf9..7debcbbd 100644 |
| 22 | --- a/src/Makefile |
| 23 | +++ b/src/Makefile |
| 24 | @@ -31,7 +31,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ |
| 25 | dio-invalidate-cache stat_test t_encrypted_d_revalidate \ |
| 26 | attr_replace_test swapon mkswap t_attr_corruption t_open_tmpfiles \ |
| 27 | fscrypt-crypt-util bulkstat_null_ocount splice-test chprojid_fail \ |
| 28 | - detached_mounts_propagation ext4_resize t_readdir_3 splice2pipe \ |
| 29 | + ext4_resize t_readdir_3 splice2pipe \ |
| 30 | uuid_ioctl |
| 31 | |
| 32 | EXTRA_EXECS = dmerror fill2attr fill2fs fill2fs_check scaleread.sh \ |
| 33 | diff --git a/src/vfs/utils.c b/src/vfs/utils.c |
| 34 | index 1388edda..aacd6c0a 100644 |
| 35 | --- a/src/vfs/utils.c |
| 36 | +++ b/src/vfs/utils.c |
| 37 | @@ -10,7 +10,6 @@ |
| 38 | #include <stdlib.h> |
| 39 | #include <sys/eventfd.h> |
| 40 | #include <sys/fsuid.h> |
| 41 | -#include <sys/mount.h> |
| 42 | #include <sys/prctl.h> |
| 43 | #include <sys/socket.h> |
| 44 | #include <sys/stat.h> |
| 45 | -- |
| 46 | 2.37.2 |
| 47 | |