1 files changed, 11 insertions, 12 deletions

diff --git a/fs/dcache.c b/fs/dcache.c
index 3aa8a7e980d8..7376b61269fb 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -19,6 +19,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/fs.h>
+#include <linux/fsnotify.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/smp_lock.h>
@@ -101,6 +102,7 @@ static inline void dentry_iput(struct dentry * dentry)
                 list_del_init(&dentry->d_alias);
                 spin_unlock(&dentry->d_lock);
                 spin_unlock(&dcache_lock);
+                fsnotify_inoderemove(inode);
                 if (dentry->d_op && dentry->d_op->d_iput)
                         dentry->d_op->d_iput(dentry, inode);
                 else
@@ -335,12 +337,10 @@ struct dentry * d_find_alias(struct inode *inode)
  */
 void d_prune_aliases(struct inode *inode)
 {
-        struct list_head *tmp, *head = &inode->i_dentry;
+        struct dentry *dentry;
 restart:
         spin_lock(&dcache_lock);
-        tmp = head;
-        while ((tmp = tmp->next) != head) {
-                struct dentry *dentry = list_entry(tmp, struct dentry, d_alias);
+        list_for_each_entry(dentry, &inode->i_dentry, d_alias) {
                 spin_lock(&dentry->d_lock);
                 if (!atomic_read(&dentry->d_count)) {
                         __dget_locked(dentry);
@@ -461,10 +461,7 @@ void shrink_dcache_sb(struct super_block * sb)
          * superblock to the most recent end of the unused list.
          */
         spin_lock(&dcache_lock);
-        next = dentry_unused.next;
-        while (next != &dentry_unused) {
-                tmp = next;
-                next = tmp->next;
+        list_for_each_safe(tmp, next, &dentry_unused) {
                 dentry = list_entry(tmp, struct dentry, d_lru);
                 if (dentry->d_sb != sb)
                         continue;
@@ -476,10 +473,7 @@ void shrink_dcache_sb(struct super_block * sb)
          * Pass two ... free the dentries for this superblock.
          */
 repeat:
-        next = dentry_unused.next;
-        while (next != &dentry_unused) {
-                tmp = next;
-                next = tmp->next;
+        list_for_each_safe(tmp, next, &dentry_unused) {
                 dentry = list_entry(tmp, struct dentry, d_lru);
                 if (dentry->d_sb != sb)
                         continue;
@@ -1165,13 +1159,16 @@ out:
  
 void d_delete(struct dentry * dentry)
 {
+        int isdir = 0;
         /*
          * Are we the only user?
          */
         spin_lock(&dcache_lock);
         spin_lock(&dentry->d_lock);
+        isdir = S_ISDIR(dentry->d_inode->i_mode);
         if (atomic_read(&dentry->d_count) == 1) {
                 dentry_iput(dentry);
+                fsnotify_nameremove(dentry, isdir);
                 return;
         }
 
@@ -1180,6 +1177,8 @@ void d_delete(struct dentry * dentry)
 
         spin_unlock(&dentry->d_lock);
         spin_unlock(&dcache_lock);
+
+        fsnotify_nameremove(dentry, isdir);
 }
 
 static void __d_rehash(struct dentry * entry, struct hlist_head *list)