Remove linux/fanotify.h

* linux/fanotify.h: Remove.
* Makefile.am (EXTRA_DIST): Remove it.
* fanotify.c: Do not include <linux/fanotify.h>.
* xlat/fan_classes.in: Add default values.
* xlat/fan_event_flags.in: Likewise.
* xlat/fan_init_flags.in: Likewise.
* xlat/fan_mark_flags.in: Likewise.
This commit is contained in:
Дмитрий Левин 2015-02-19 21:55:09 +00:00
parent 2094573930
commit 34bbcc6270
7 changed files with 32 additions and 82 deletions

View File

@ -199,7 +199,6 @@ EXTRA_DIST = \
linux/crisv32/userent.h \
linux/dummy.h \
linux/errnoent.h \
linux/fanotify.h \
linux/hppa/arch_regs.h \
linux/hppa/errnoent.h \
linux/hppa/ioctls_arch0.h \

View File

@ -1,9 +1,15 @@
#include "defs.h"
#include <linux/fanotify.h>
#include "xlat/fan_classes.h"
#include "xlat/fan_init_flags.h"
#ifndef FAN_ALL_CLASS_BITS
# define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | FAN_CLASS_PRE_CONTENT)
#endif
#ifndef FAN_NOFD
# define FAN_NOFD -1
#endif
int
sys_fanotify_init(struct tcb *tcp)
{

View File

@ -1,54 +0,0 @@
#ifndef _LINUX_FANOTIFY_H
#define _LINUX_FANOTIFY_H
/* the following events that user-space can register for */
#define FAN_ACCESS 0x00000001 /* File was accessed */
#define FAN_MODIFY 0x00000002 /* File was modified */
#define FAN_CLOSE_WRITE 0x00000008 /* Writtable file closed */
#define FAN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */
#define FAN_OPEN 0x00000020 /* File was opened */
#define FAN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */
#define FAN_OPEN_PERM 0x00010000 /* File open in perm check */
#define FAN_ACCESS_PERM 0x00020000 /* File accessed in perm check */
#define FAN_ONDIR 0x40000000 /* event occurred against dir */
#define FAN_EVENT_ON_CHILD 0x08000000 /* interested in child events */
/* helper events */
#define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
/* flags used for fanotify_init() */
#define FAN_CLOEXEC 0x00000001
#define FAN_NONBLOCK 0x00000002
/* These are NOT bitwise flags. Both bits are used togther. */
#define FAN_CLASS_NOTIF 0x00000000
#define FAN_CLASS_CONTENT 0x00000004
#define FAN_CLASS_PRE_CONTENT 0x00000008
#define FAN_ALL_CLASS_BITS (FAN_CLASS_NOTIF | FAN_CLASS_CONTENT | \
FAN_CLASS_PRE_CONTENT)
#define FAN_UNLIMITED_QUEUE 0x00000010
#define FAN_UNLIMITED_MARKS 0x00000020
#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | \
FAN_ALL_CLASS_BITS | FAN_UNLIMITED_QUEUE |\
FAN_UNLIMITED_MARKS)
/* flags used for fanotify_modify_mark() */
#define FAN_MARK_ADD 0x00000001
#define FAN_MARK_REMOVE 0x00000002
#define FAN_MARK_DONT_FOLLOW 0x00000004
#define FAN_MARK_ONLYDIR 0x00000008
#define FAN_MARK_MOUNT 0x00000010
#define FAN_MARK_IGNORED_MASK 0x00000020
#define FAN_MARK_IGNORED_SURV_MODIFY 0x00000040
#define FAN_MARK_FLUSH 0x00000080
/* No fd set in event */
#define FAN_NOFD -1
#endif /* _LINUX_FANOTIFY_H */

View File

@ -1,3 +1,3 @@
FAN_CLASS_NOTIF
FAN_CLASS_CONTENT
FAN_CLASS_PRE_CONTENT
FAN_CLASS_NOTIF 0x00000000
FAN_CLASS_CONTENT 0x00000004
FAN_CLASS_PRE_CONTENT 0x00000008

View File

@ -1,11 +1,10 @@
FAN_ACCESS
FAN_MODIFY
FAN_CLOSE
FAN_CLOSE_WRITE
FAN_CLOSE_NOWRITE
FAN_OPEN
FAN_Q_OVERFLOW
FAN_OPEN_PERM
FAN_ACCESS_PERM
FAN_ONDIR
FAN_EVENT_ON_CHILD
FAN_ACCESS 0x00000001
FAN_MODIFY 0x00000002
FAN_CLOSE_WRITE 0x00000008
FAN_CLOSE_NOWRITE 0x00000010
FAN_OPEN 0x00000020
FAN_Q_OVERFLOW 0x00004000
FAN_OPEN_PERM 0x00010000
FAN_ACCESS_PERM 0x00020000
FAN_ONDIR 0x40000000
FAN_EVENT_ON_CHILD 0x08000000

View File

@ -1,4 +1,4 @@
FAN_CLOEXEC
FAN_NONBLOCK
FAN_UNLIMITED_QUEUE
FAN_UNLIMITED_MARKS
FAN_CLOEXEC 0x00000001
FAN_NONBLOCK 0x00000002
FAN_UNLIMITED_QUEUE 0x00000010
FAN_UNLIMITED_MARKS 0x00000020

View File

@ -1,8 +1,8 @@
FAN_MARK_ADD
FAN_MARK_REMOVE
FAN_MARK_DONT_FOLLOW
FAN_MARK_ONLYDIR
FAN_MARK_MOUNT
FAN_MARK_IGNORED_MASK
FAN_MARK_IGNORED_SURV_MODIFY
FAN_MARK_FLUSH
FAN_MARK_ADD 0x00000001
FAN_MARK_REMOVE 0x00000002
FAN_MARK_DONT_FOLLOW 0x00000004
FAN_MARK_ONLYDIR 0x00000008
FAN_MARK_MOUNT 0x00000010
FAN_MARK_IGNORED_MASK 0x00000020
FAN_MARK_IGNORED_SURV_MODIFY 0x00000040
FAN_MARK_FLUSH 0x00000080