X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fdnotify.h;h=5cffeedac4129222e07e6e8c9cf4aee8e89ace7e;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=f134a01975c7342fa42b1a986b2d9d5aee86bd98;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/include/linux/dnotify.h b/include/linux/dnotify.h
index f134a0197..5cffeedac 100644
--- 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 */