replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sanitizer] Replace ext2_ ioctls with generic fs_ ioctls. 

They are actually the same, but ext2_fs.h header is not available in userspace
with newer kernels.

llvm-svn: 184184
This commit is contained in:
Evgeniy Stepanov 2013-06-18 09:49:04 +00:00
parent 8fa046e288
commit b9c1020696
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
View File

@ -130,10 +130,10 @@ static void ioctl_table_fill() {
_(CDROMVOLCTRL, READ, struct_cdrom_volctrl_sz);
_(CDROMVOLREAD, WRITE, struct_cdrom_volctrl_sz);
_(CDROM_GET_UPC, WRITE, 8);
_(EXT2_IOC_GETFLAGS, WRITE, sizeof(int));
_(EXT2_IOC_GETVERSION, WRITE, sizeof(int));
_(EXT2_IOC_SETFLAGS, READ, sizeof(int));
_(EXT2_IOC_SETVERSION, READ, sizeof(int));
_(FS_IOC_GETFLAGS, WRITE, sizeof(int));
_(FS_IOC_GETVERSION, WRITE, sizeof(int));
_(FS_IOC_SETFLAGS, READ, sizeof(int));
_(FS_IOC_SETVERSION, READ, sizeof(int));
_(FDCLRPRM, NONE, 0);
_(FDDEFPRM, READ, struct_floppy_struct_sz);
_(FDFLUSH, NONE, 0);

10
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
View File

@ -43,8 +43,8 @@
#include <sys/mount.h>
#include <sys/vt.h>
#include <linux/cdrom.h>
#include <linux/ext2_fs.h>
#include <linux/fd.h>
#include <linux/fs.h>
#include <linux/hdreg.h>
#include <linux/ppp_defs.h>
#include <linux/if_ppp.h>
@ -306,10 +306,10 @@ namespace __sanitizer {
unsigned IOCTL_CDROMVOLCTRL = CDROMVOLCTRL;
unsigned IOCTL_CDROMVOLREAD = CDROMVOLREAD;
unsigned IOCTL_CDROM_GET_UPC = CDROM_GET_UPC;
unsigned IOCTL_EXT2_IOC_GETFLAGS = EXT2_IOC_GETFLAGS;
unsigned IOCTL_EXT2_IOC_GETVERSION = EXT2_IOC_GETVERSION;
unsigned IOCTL_EXT2_IOC_SETFLAGS = EXT2_IOC_SETFLAGS;
unsigned IOCTL_EXT2_IOC_SETVERSION = EXT2_IOC_SETVERSION;
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_FDCLRPRM = FDCLRPRM;
unsigned IOCTL_FDDEFPRM = FDDEFPRM;
unsigned IOCTL_FDFLUSH = FDFLUSH;

8
compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
View File

@ -305,10 +305,10 @@ namespace __sanitizer {
extern unsigned IOCTL_CDROMVOLCTRL;
extern unsigned IOCTL_CDROMVOLREAD;
extern unsigned IOCTL_CDROM_GET_UPC;
extern unsigned IOCTL_EXT2_IOC_GETFLAGS;
extern unsigned IOCTL_EXT2_IOC_GETVERSION;
extern unsigned IOCTL_EXT2_IOC_SETFLAGS;
extern unsigned IOCTL_EXT2_IOC_SETVERSION;
extern unsigned IOCTL_FS_IOC_GETFLAGS;
extern unsigned IOCTL_FS_IOC_GETVERSION;
extern unsigned IOCTL_FS_IOC_SETFLAGS;
extern unsigned IOCTL_FS_IOC_SETVERSION;
extern unsigned IOCTL_FDCLRPRM;
extern unsigned IOCTL_FDDEFPRM;
extern unsigned IOCTL_FDFLUSH;