From ac1257a1a11cf17216c52fa0c51bad6d2becd8ce Mon Sep 17 00:00:00 2001
From: Amy Griffis <amy.griffis@hp.com>
Date: Fri, 31 Mar 2006 02:30:54 -0800
Subject: [PATCH] --- yaml --- r: 24896 b: refs/heads/master c:
 7a2bd3f7efa86e8b56482a8f8948c8b222064a67 h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/fs/dcache.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ebaadb503e67..ce980ff86e0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 094e320d761dae5816d8faa695b0509eea79c108
+refs/heads/master: 7a2bd3f7efa86e8b56482a8f8948c8b222064a67
diff --git a/trunk/fs/dcache.c b/trunk/fs/dcache.c
index 19458d399502..21dffeec755b 100644
--- a/trunk/fs/dcache.c
+++ b/trunk/fs/dcache.c
@@ -1172,11 +1172,11 @@ void d_delete(struct dentry * dentry)
 	spin_lock(&dentry->d_lock);
 	isdir = S_ISDIR(dentry->d_inode->i_mode);
 	if (atomic_read(&dentry->d_count) == 1) {
-		/* remove this and other inotify debug checks after 2.6.18 */
-		dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED;
-
 		dentry_iput(dentry);
 		fsnotify_nameremove(dentry, isdir);
+
+		/* remove this and other inotify debug checks after 2.6.18 */
+		dentry->d_flags &= ~DCACHE_INOTIFY_PARENT_WATCHED;
 		return;
 	}