From: Fangrui Song <i@maskray.me>
Date: Mon, 11 Jul 2022 19:44:37 +0000 (-0700)
Subject: Revert "[sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_at... 
X-Git-Tag: upstream/15.0.7~2071
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2ce7e824df4d5fe78725770b264a22ac8f0677d;p=platform%2Fupstream%2Fllvm.git

Revert "[sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36"

This reverts commit b379129c4beb3f26223288627a1291739f33af02.

Breaks Android build. Android sys/mount.h doesn't define macros like BLKBSZGET.
---

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
index 81740bf..4bd4254 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -73,6 +73,7 @@
 #include <sys/vt.h>
 #include <linux/cdrom.h>
 #include <linux/fd.h>
+#include <linux/fs.h>
 #include <linux/hdreg.h>
 #include <linux/input.h>
 #include <linux/ioctl.h>
@@ -875,10 +876,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
   unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
 #endif
-  unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
-  unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
-  unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
-  unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
+  unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
+  unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
+  unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
+  unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
   unsigned IOCTL_GIO_CMAP = GIO_CMAP;
   unsigned IOCTL_GIO_FONT = GIO_FONT;
   unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;