This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / dnotify.h

diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h
index f134a01..5cffeed 100644 (file)
--- a/include/linux/dnotify.h
+++ b/include/linux/dnotify.h
@@ -1,5 +1,3 @@
-#ifndef _LINUX_DNOTIFY_H
-#define _LINUX_DNOTIFY_H
 /*
  * Directory notification for Linux
  *
@@ -10,54 +8,20 @@
 
 struct dnotify_struct {
        struct dnotify_struct * dn_next;
-       unsigned long           dn_mask;
+       unsigned long           dn_mask;        /* Events to be notified
+                                                  see linux/fcntl.h */
        int                     dn_fd;
        struct file *           dn_filp;
        fl_owner_t              dn_owner;
 };
 
-#ifdef __KERNEL__
-
-#include <linux/config.h>
-
-#ifdef CONFIG_DNOTIFY
-
 extern void __inode_dir_notify(struct inode *, unsigned long);
-extern void dnotify_flush(struct file *, fl_owner_t);
+extern void dnotify_flush(struct file *filp, fl_owner_t id);
 extern int fcntl_dirnotify(int, struct file *, unsigned long);
-extern void dnotify_parent(struct dentry *, unsigned long);
+void dnotify_parent(struct dentry *dentry, unsigned long event);
 
 static inline void inode_dir_notify(struct inode *inode, unsigned long event)
 {
-       if (inode->i_dnotify_mask & (event))
+       if ((inode)->i_dnotify_mask & (event))
                __inode_dir_notify(inode, event);
 }
-
-#else
-
-static inline void __inode_dir_notify(struct inode *inode, unsigned long event)
-{
-}
-
-static inline void dnotify_flush(struct file *filp, fl_owner_t id)
-{
-}
-
-static inline int fcntl_dirnotify(int fd, struct file *filp, unsigned long arg)
-{
-       return -EINVAL;
-}
-
-static inline void dnotify_parent(struct dentry *dentry, unsigned long event)
-{
-}
-
-static inline void inode_dir_notify(struct inode *inode, unsigned long event)
-{
-}
-
-#endif /* CONFIG_DNOTIFY */
-
-#endif /* __KERNEL __ */
-
-#endif /* _LINUX_DNOTIFY_H */