Skip to content

Commit d2356eb

Browse files
committed
libsanitizer: cherry-pick 9cf1306 from upstream
9cf1306 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (cherry picked from commit 2701442)
1 parent 8522fab commit d2356eb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@
7272
#include <sys/vt.h>
7373
#include <linux/cdrom.h>
7474
#include <linux/fd.h>
75+
#if SANITIZER_ANDROID
7576
#include <linux/fs.h>
77+
#endif
7678
#include <linux/hdreg.h>
7779
#include <linux/input.h>
7880
#include <linux/ioctl.h>
@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
828830
unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
829831
unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
830832
#endif
831-
unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
832-
unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
833-
unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
834-
unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
833+
unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
834+
unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
835+
unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
836+
unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
835837
unsigned IOCTL_GIO_CMAP = GIO_CMAP;
836838
unsigned IOCTL_GIO_FONT = GIO_FONT;
837839
unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;

0 commit comments

Comments
 (0)