From 510c336e743c35a7385b2213036e42f2686303a5 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <compudj@krystal.dyndns.org>
Date: Fri, 24 Nov 2006 13:51:14 -0500
Subject: [PATCH] --- yaml --- r: 44564 b: refs/heads/master c:
 29a7f3ada7fea5510504c5359c3f70d109aeb055 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/debugfs/inode.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b7fe1cdf39db..040fcf318fca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65c333367b1aea57d58168ad3dc1df27b0227401
+refs/heads/master: 29a7f3ada7fea5510504c5359c3f70d109aeb055
diff --git a/trunk/fs/debugfs/inode.c b/trunk/fs/debugfs/inode.c
index 554f4a9dfaf8..c692487346ea 100644
--- a/trunk/fs/debugfs/inode.c
+++ b/trunk/fs/debugfs/inode.c
@@ -286,6 +286,7 @@ void debugfs_remove(struct dentry *dentry)
 	mutex_lock(&parent->d_inode->i_mutex);
 	if (debugfs_positive(dentry)) {
 		if (dentry->d_inode) {
+			dget(dentry);
 			if (S_ISDIR(dentry->d_inode->i_mode)) {
 				ret = simple_rmdir(parent->d_inode, dentry);
 				if (ret)
@@ -295,6 +296,9 @@ void debugfs_remove(struct dentry *dentry)
 						dentry->d_name.name);
 			} else
 				simple_unlink(parent->d_inode, dentry);
+			if (!ret)
+				d_delete(dentry);
+			dput(dentry);
 		}
 	}
 	mutex_unlock(&parent->d_inode->i_mutex);