X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Ffsnotify.h;h=03b8e7932b830a3f1bfffcc531ec4ee9b1662b1e;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=11438eff4d4455573f76789edfd5ffb0cc646473;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 11438eff4..03b8e7932 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -15,26 +15,6 @@
 
 #include <linux/dnotify.h>
 #include <linux/inotify.h>
-#include <linux/audit.h>
-
-/*
- * fsnotify_d_instantiate - instantiate a dentry for inode
- * Called with dcache_lock held.
- */
-static inline void fsnotify_d_instantiate(struct dentry *entry,
-						struct inode *inode)
-{
-	inotify_d_instantiate(entry, inode);
-}
-
-/*
- * fsnotify_d_move - entry has been moved
- * Called with dcache_lock and entry->d_lock held.
- */
-static inline void fsnotify_d_move(struct dentry *entry)
-{
-	inotify_d_move(entry);
-}
 
 /*
  * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir
@@ -65,8 +45,6 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
 	if (source) {
 		inotify_inode_queue_event(source, IN_MOVE_SELF, 0, NULL);
 	}
-	audit_inode_child(old_name, source, old_dir->i_ino);
-	audit_inode_child(new_name, target, new_dir->i_ino);
 }
 
 /*
@@ -92,22 +70,19 @@ static inline void fsnotify_inoderemove(struct inode *inode)
 /*
  * fsnotify_create - 'name' was linked in
  */
-static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
+static inline void fsnotify_create(struct inode *inode, const char *name)
 {
 	inode_dir_notify(inode, DN_CREATE);
-	inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name);
-	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
+	inotify_inode_queue_event(inode, IN_CREATE, 0, name);
 }
 
 /*
  * fsnotify_mkdir - directory 'name' was created
  */
-static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
+static inline void fsnotify_mkdir(struct inode *inode, const char *name)
 {
 	inode_dir_notify(inode, DN_CREATE);
-	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, 
-				  dentry->d_name.name);
-	audit_inode_child(dentry->d_name.name, dentry->d_inode, inode->i_ino);
+	inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, name);
 }
 
 /*