3 files changed, 3 insertions, 226 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 68ca1b0491af..e5598d2f99b9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -771,11 +771,6 @@ struct inode {
         struct hlist_head       i_fsnotify_mark_entries; /* fsnotify mark entries */
 #endif
 
-#ifdef CONFIG_INOTIFY
-        struct list_head        inotify_watches; /* watches on this inode */
-        struct mutex            inotify_mutex;  /* protects the watches list */
-#endif
-
         unsigned long           i_state;
         unsigned long           dirtied_when;   /* jiffies of first dirtying */
 
diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 01755909ce81..f958e93feb97 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -11,8 +11,6 @@
  * (C) Copyright 2005 Robert Love
  */
 
-#include <linux/dnotify.h>
-#include <linux/inotify.h>
 #include <linux/fsnotify_backend.h>
 #include <linux/audit.h>
 #include <linux/slab.h>
@@ -25,16 +23,12 @@ static inline void fsnotify_d_instantiate(struct dentry *entry,
                                                 struct inode *inode)
 {
         __fsnotify_d_instantiate(entry, inode);
-
-        inotify_d_instantiate(entry, inode);
 }
 
 /* Notify this dentry's parent about a child's events. */
 static inline void fsnotify_parent(struct dentry *dentry, __u32 mask)
 {
         __fsnotify_parent(dentry, mask);
-
-        inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
 }
 
 /*
@@ -48,8 +42,6 @@ static inline void fsnotify_d_move(struct dentry *entry)
          * cares about events from this entry.
          */
         __fsnotify_update_dcache_flags(entry);
-
-        inotify_d_move(entry);
 }
 
 /*
@@ -57,8 +49,6 @@ static inline void fsnotify_d_move(struct dentry *entry)
  */
 static inline void fsnotify_link_count(struct inode *inode)
 {
-        inotify_inode_queue_event(inode, IN_ATTRIB, 0, NULL, NULL);
-
         fsnotify(inode, FS_ATTRIB, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
 }
 
@@ -70,7 +60,6 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
                                  int isdir, struct inode *target, struct dentry *moved)
 {
         struct inode *source = moved->d_inode;
-        u32 in_cookie = inotify_get_cookie();
         u32 fs_cookie = fsnotify_get_cookie();
         __u32 old_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_FROM);
         __u32 new_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_TO);
@@ -80,31 +69,18 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
                 old_dir_mask |= FS_DN_RENAME;
 
         if (isdir) {
-                isdir = IN_ISDIR;
                 old_dir_mask |= FS_IN_ISDIR;
                 new_dir_mask |= FS_IN_ISDIR;
         }
 
-        inotify_inode_queue_event(old_dir, IN_MOVED_FROM|isdir, in_cookie, old_name,
-                                  source);
-        inotify_inode_queue_event(new_dir, IN_MOVED_TO|isdir, in_cookie, new_name,
-                                  source);
-
         fsnotify(old_dir, old_dir_mask, old_dir, FSNOTIFY_EVENT_INODE, old_name, fs_cookie);
         fsnotify(new_dir, new_dir_mask, new_dir, FSNOTIFY_EVENT_INODE, new_name, fs_cookie);
 
-        if (target) {
-                inotify_inode_queue_event(target, IN_DELETE_SELF, 0, NULL, NULL);
-                inotify_inode_is_dead(target);
-
-                /* this is really a link_count change not a removal */
+        if (target)
                 fsnotify_link_count(target);
-        }
 
-        if (source) {
-                inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL, NULL);
+        if (source)
                 fsnotify(source, FS_MOVE_SELF, moved->d_inode, FSNOTIFY_EVENT_INODE, NULL, 0);
-        }
         audit_inode_child(moved, new_dir);
 }
 
@@ -134,9 +110,6 @@ static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
  */
 static inline void fsnotify_inoderemove(struct inode *inode)
 {
-        inotify_inode_queue_event(inode, IN_DELETE_SELF, 0, NULL, NULL);
-        inotify_inode_is_dead(inode);
-
         fsnotify(inode, FS_DELETE_SELF, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
         __fsnotify_inode_delete(inode);
 }
@@ -146,8 +119,6 @@ static inline void fsnotify_inoderemove(struct inode *inode)
  */
 static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
 {
-        inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name,
-                                  dentry->d_inode);
         audit_inode_child(dentry, inode);
 
         fsnotify(inode, FS_CREATE, dentry->d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
@@ -160,8 +131,6 @@ static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
  */
 static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct dentry *new_dentry)
 {
-        inotify_inode_queue_event(dir, IN_CREATE, 0, new_dentry->d_name.name,
-                                  inode);
         fsnotify_link_count(inode);
         audit_inode_child(new_dentry, dir);
 
@@ -176,7 +145,6 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
         __u32 mask = (FS_CREATE | FS_IN_ISDIR);
         struct inode *d_inode = dentry->d_inode;
 
-        inotify_inode_queue_event(inode, mask, 0, dentry->d_name.name, d_inode);
         audit_inode_child(dentry, inode);
 
         fsnotify(inode, mask, d_inode, FSNOTIFY_EVENT_INODE, dentry->d_name.name, 0);
@@ -193,8 +161,6 @@ static inline void fsnotify_access(struct dentry *dentry)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
         fsnotify_parent(dentry, mask);
         fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
 }
@@ -210,8 +176,6 @@ static inline void fsnotify_modify(struct dentry *dentry)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
         fsnotify_parent(dentry, mask);
         fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
 }
@@ -227,8 +191,6 @@ static inline void fsnotify_open(struct dentry *dentry)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
         fsnotify_parent(dentry, mask);
         fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
 }
@@ -246,8 +208,6 @@ static inline void fsnotify_close(struct file *file)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
         fsnotify_parent(dentry, mask);
         fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
 }
@@ -263,8 +223,6 @@ static inline void fsnotify_xattr(struct dentry *dentry)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
         fsnotify_parent(dentry, mask);
         fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
 }
@@ -299,14 +257,12 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
         if (mask) {
                 if (S_ISDIR(inode->i_mode))
                         mask |= FS_IN_ISDIR;
-                inotify_inode_queue_event(inode, mask, 0, NULL, NULL);
-
                 fsnotify_parent(dentry, mask);
                 fsnotify(inode, mask, inode, FSNOTIFY_EVENT_INODE, NULL, 0);
         }
 }
 
-#if defined(CONFIG_INOTIFY) || defined(CONFIG_FSNOTIFY) /* notify helpers */
+#if defined(CONFIG_FSNOTIFY)    /* notify helpers */
 
 /*
  * fsnotify_oldname_init - save off the old filename before we change it
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index 37ea2894b3c0..959a38b8f75d 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -69,178 +69,4 @@ struct inotify_event {
 #define IN_CLOEXEC O_CLOEXEC
 #define IN_NONBLOCK O_NONBLOCK
 
-#ifdef __KERNEL__
-
-#include <linux/dcache.h>
-#include <linux/fs.h>
-
-/*
- * struct inotify_watch - represents a watch request on a specific inode
- *
- * h_list is protected by ih->mutex of the associated inotify_handle.
- * i_list, mask are protected by inode->inotify_mutex of the associated inode.
- * ih, inode, and wd are never written to once the watch is created.
- *
- * Callers must use the established inotify interfaces to access inotify_watch
- * contents.  The content of this structure is private to the inotify
- * implementation.
- */
-struct inotify_watch {
-        struct list_head        h_list; /* entry in inotify_handle's list */
-        struct list_head        i_list; /* entry in inode's list */
-        atomic_t                count;  /* reference count */
-        struct inotify_handle   *ih;    /* associated inotify handle */
-        struct inode            *inode; /* associated inode */
-        __s32                   wd;     /* watch descriptor */
-        __u32                   mask;   /* event mask for this watch */
-};
-
-struct inotify_operations {
-        void (*handle_event)(struct inotify_watch *, u32, u32, u32,
-                             const char *, struct inode *);
-        void (*destroy_watch)(struct inotify_watch *);
-};
-
-#ifdef CONFIG_INOTIFY
-
-/* Kernel API for producing events */
-
-extern void inotify_d_instantiate(struct dentry *, struct inode *);
-extern void inotify_d_move(struct dentry *);
-extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
-                                      const char *, struct inode *);
-extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
-                                              const char *);
-extern void inotify_unmount_inodes(struct list_head *);
-extern void inotify_inode_is_dead(struct inode *);
-extern u32 inotify_get_cookie(void);
-
-/* Kernel Consumer API */
-
-extern struct inotify_handle *inotify_init(const struct inotify_operations *);
-extern void inotify_init_watch(struct inotify_watch *);
-extern void inotify_destroy(struct inotify_handle *);
-extern __s32 inotify_find_watch(struct inotify_handle *, struct inode *,
-                                struct inotify_watch **);
-extern __s32 inotify_find_update_watch(struct inotify_handle *, struct inode *,
-                                       u32);
-extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,
-                               struct inode *, __u32);
-extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *);
-extern void inotify_evict_watch(struct inotify_watch *);
-extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);
-extern int inotify_rm_wd(struct inotify_handle *, __u32);
-extern void inotify_remove_watch_locked(struct inotify_handle *,
-                                        struct inotify_watch *);
-extern void get_inotify_watch(struct inotify_watch *);
-extern void put_inotify_watch(struct inotify_watch *);
-extern int pin_inotify_watch(struct inotify_watch *);
-extern void unpin_inotify_watch(struct inotify_watch *);
-
-#else
-
-static inline void inotify_d_instantiate(struct dentry *dentry,
-                                        struct inode *inode)
-{
-}
-
-static inline void inotify_d_move(struct dentry *dentry)
-{
-}
-
-static inline void inotify_inode_queue_event(struct inode *inode,
-                                             __u32 mask, __u32 cookie,
-                                             const char *filename,
-                                             struct inode *n_inode)
-{
-}
-
-static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
-                                                     __u32 mask, __u32 cookie,
-                                                     const char *filename)
-{
-}
-
-static inline void inotify_unmount_inodes(struct list_head *list)
-{
-}
-
-static inline void inotify_inode_is_dead(struct inode *inode)
-{
-}
-
-static inline u32 inotify_get_cookie(void)
-{
-        return 0;
-}
-
-static inline struct inotify_handle *inotify_init(const struct inotify_operations *ops)
-{
-        return ERR_PTR(-EOPNOTSUPP);
-}
-
-static inline void inotify_init_watch(struct inotify_watch *watch)
-{
-}
-
-static inline void inotify_destroy(struct inotify_handle *ih)
-{
-}
-
-static inline __s32 inotify_find_watch(struct inotify_handle *ih, struct inode *inode,
-                                       struct inotify_watch **watchp)
-{
-        return -EOPNOTSUPP;
-}
-
-static inline __s32 inotify_find_update_watch(struct inotify_handle *ih,
-                                              struct inode *inode, u32 mask)
-{
-        return -EOPNOTSUPP;
-}
-
-static inline __s32 inotify_add_watch(struct inotify_handle *ih,
-                                      struct inotify_watch *watch,
-                                      struct inode *inode, __u32 mask)
-{
-        return -EOPNOTSUPP;
-}
-
-static inline int inotify_rm_watch(struct inotify_handle *ih,
-                                   struct inotify_watch *watch)
-{
-        return -EOPNOTSUPP;
-}
-
-static inline int inotify_rm_wd(struct inotify_handle *ih, __u32 wd)
-{
-        return -EOPNOTSUPP;
-}
-
-static inline void inotify_remove_watch_locked(struct inotify_handle *ih,
-                                               struct inotify_watch *watch)
-{
-}
-
-static inline void get_inotify_watch(struct inotify_watch *watch)
-{
-}
-
-static inline void put_inotify_watch(struct inotify_watch *watch)
-{
-}
-
-extern inline int pin_inotify_watch(struct inotify_watch *watch)
-{
-        return 0;
-}
-
-extern inline void unpin_inotify_watch(struct inotify_watch *watch)
-{
-}
-
-#endif  /* CONFIG_INOTIFY */
-
-#endif  /* __KERNEL __ */
-
 #endif  /* _LINUX_INOTIFY_H */