Skip to content

Commit b379129

Browse files
committed
[sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
It is generally not a good idea to mix usage of glibc headers and Linux UAPI headers (https://sourceware.org/glibc/wiki/Synchronizing_Headers). In glibc since 7eae6a91e9b1670330c9f15730082c91c0b1d570 (milestone: 2.36), sys/mount.h defines `fsconfig_command` which conflicts with linux/mount.h: .../usr/include/linux/mount.h:95:6: error: redeclaration of ‘enum fsconfig_command’ Remove #include <linux/fs.h> which pulls in linux/mount.h. Expand its 4 macros manually. Fix #56421 Reviewed By: #sanitizers, vitalybuka, zatrazz Differential Revision: https://reviews.llvm.org/D129471
1 parent 3d438ce commit b379129

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
#include <sys/vt.h>
7474
#include <linux/cdrom.h>
7575
#include <linux/fd.h>
76-
#include <linux/fs.h>
7776
#include <linux/hdreg.h>
7877
#include <linux/input.h>
7978
#include <linux/ioctl.h>
@@ -876,10 +875,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
876875
unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
877876
unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
878877
#endif
879-
unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
880-
unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
881-
unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
882-
unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
878+
unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
879+
unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
880+
unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
881+
unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
883882
unsigned IOCTL_GIO_CMAP = GIO_CMAP;
884883
unsigned IOCTL_GIO_FONT = GIO_FONT;
885884
unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;

0 commit comments

Comments
 (0)