Remove linux/inotify.h

* linux/inotify.h: Remove.
* Makefile.am (EXTRA_DIST): Remove it.
* inotify.c: Do not include <linux/inotify.h>.
* xlat/inotify_flags.in: Add default values.

diff --git a/Makefile.am b/Makefile.am
index 494d7d0998aa7a9e86880fc46f5898edbf31befb..3531930a503ee91318221e021357dca1ab4c64b2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,7 +219,6 @@ EXTRA_DIST =                                \
        linux/ia64/syscallent.h         \
        linux/ia64/userent.h            \
        linux/inet_diag.h               \
-       linux/inotify.h                 \
        linux/kexec.h                   \
        linux/keyctl.h                  \
        linux/m68k/ioctls_arch0.h       \

diff --git a/inotify.c b/inotify.c
index 32f6b31194da5f552da8c1b53be6ebed7801a90b..81c8c5d832b3e59bb90265f9d34bec85e6a2dc23 100644 (file)
--- a/inotify.c
+++ b/inotify.c
@@ -1,6 +1,5 @@
 #include "defs.h"
 #include <fcntl.h>
-#include <linux/inotify.h>
 
 #include "xlat/inotify_flags.h"
 #include "xlat/inotify_init_flags.h"

diff --git a/linux/inotify.h b/linux/inotify.h
deleted file mode 100644 (file)
index 0af0307..0000000
--- a/linux/inotify.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Inode based directory notification for Linux
- *
- * Copyright (C) 2005 John McCutchan
- */
-
-#ifndef _LINUX_INOTIFY_H
-#define _LINUX_INOTIFY_H
-
-/* the following are legal, implemented events that user-space can watch for */
-#define IN_ACCESS              0x00000001      /* File was accessed */
-#define IN_MODIFY              0x00000002      /* File was modified */
-#define IN_ATTRIB              0x00000004      /* Metadata changed */
-#define IN_CLOSE_WRITE         0x00000008      /* Writtable file was closed */
-#define IN_CLOSE_NOWRITE       0x00000010      /* Unwrittable file closed */
-#define IN_OPEN                        0x00000020      /* File was opened */
-#define IN_MOVED_FROM          0x00000040      /* File was moved from X */
-#define IN_MOVED_TO            0x00000080      /* File was moved to Y */
-#define IN_CREATE              0x00000100      /* Subfile was created */
-#define IN_DELETE              0x00000200      /* Subfile was deleted */
-#define IN_DELETE_SELF         0x00000400      /* Self was deleted */
-#define IN_MOVE_SELF           0x00000800      /* Self was moved */
-
-/* the following are legal events.  they are sent as needed to any watch */
-#define IN_UNMOUNT             0x00002000      /* Backing fs was unmounted */
-#define IN_Q_OVERFLOW          0x00004000      /* Event queued overflowed */
-#define IN_IGNORED             0x00008000      /* File was ignored */
-
-/* helper events */
-#define IN_CLOSE               (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* close */
-#define IN_MOVE                        (IN_MOVED_FROM | IN_MOVED_TO) /* moves */
-
-/* special flags */
-#define IN_ONLYDIR             0x01000000      /* only watch the path if it is a directory */
-#define IN_DONT_FOLLOW         0x02000000      /* don't follow a sym link */
-#define IN_EXCL_UNLINK         0x04000000      /* exclude events on unlinked objects */
-#define IN_MASK_ADD            0x20000000      /* add to the mask of an already existing watch */
-#define IN_ISDIR               0x40000000      /* event occurred against dir */
-#define IN_ONESHOT             0x80000000      /* only send event once */
-
-
-#endif /* _LINUX_INOTIFY_H */

diff --git a/xlat/inotify_flags.in b/xlat/inotify_flags.in
index 605b86428ad4c755a1a8f0b47c81194caf082c66..db1d839363b33078e74c4dec03b4190e9ea2d3b5 100644 (file)
--- a/xlat/inotify_flags.in
+++ b/xlat/inotify_flags.in
@@ -1,23 +1,21 @@
-IN_ACCESS
-IN_MODIFY
-IN_ATTRIB
-IN_CLOSE
-IN_CLOSE_WRITE
-IN_CLOSE_NOWRITE
-IN_OPEN
-IN_MOVE
-IN_MOVED_FROM
-IN_MOVED_TO
-IN_CREATE
-IN_DELETE
-IN_DELETE_SELF
-IN_MOVE_SELF
-IN_UNMOUNT
-IN_Q_OVERFLOW
-IN_IGNORED
-IN_ONLYDIR
-IN_DONT_FOLLOW
-IN_EXCL_UNLINK
-IN_MASK_ADD
-IN_ISDIR
-IN_ONESHOT
+IN_ACCESS 0x00000001
+IN_MODIFY 0x00000002
+IN_ATTRIB 0x00000004
+IN_CLOSE_WRITE 0x00000008
+IN_CLOSE_NOWRITE 0x00000010
+IN_OPEN 0x00000020
+IN_MOVED_FROM 0x00000040
+IN_MOVED_TO 0x00000080
+IN_CREATE 0x00000100
+IN_DELETE 0x00000200
+IN_DELETE_SELF 0x00000400
+IN_MOVE_SELF 0x00000800
+IN_UNMOUNT 0x00002000
+IN_Q_OVERFLOW 0x00004000
+IN_IGNORED 0x00008000
+IN_ONLYDIR 0x01000000
+IN_DONT_FOLLOW 0x02000000
+IN_EXCL_UNLINK 0x04000000
+IN_MASK_ADD 0x20000000
+IN_ISDIR 0x40000000
+IN_ONESHOT 0x80000000