From a5b11c0b0eb7766a32c69ee9045e939968158edc Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <compudj@krystal.dyndns.org>
Date: Fri, 24 Nov 2006 13:50:09 -0500
Subject: [PATCH] --- yaml --- r: 44563 b: refs/heads/master c:
 65c333367b1aea57d58168ad3dc1df27b0227401 h: refs/heads/master i:   44561:
 2e8bba7a53bdab45113d77e81a7f31dcad4cae1d   44559:
 aba2bd25ffacf95d78f023eeddbade46ba3b782b v: v3

---
 [refs]                   |  2 +-
 trunk/fs/debugfs/inode.c | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9d412154773a..b7fe1cdf39db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63223a0654c2a473ae64835819b87826cb7415ee
+refs/heads/master: 65c333367b1aea57d58168ad3dc1df27b0227401
diff --git a/trunk/fs/debugfs/inode.c b/trunk/fs/debugfs/inode.c
index d6c5fb53c746..554f4a9dfaf8 100644
--- a/trunk/fs/debugfs/inode.c
+++ b/trunk/fs/debugfs/inode.c
@@ -162,6 +162,7 @@ static int debugfs_create_by_name(const char *name, mode_t mode,
 			error = debugfs_mkdir(parent->d_inode, *dentry, mode);
 		else 
 			error = debugfs_create(parent->d_inode, *dentry, mode);
+		dput(*dentry);
 	} else
 		error = PTR_ERR(*dentry);
 	mutex_unlock(&parent->d_inode->i_mutex);
@@ -273,6 +274,7 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
 void debugfs_remove(struct dentry *dentry)
 {
 	struct dentry *parent;
+	int ret = 0;
 	
 	if (!dentry)
 		return;
@@ -284,11 +286,15 @@ void debugfs_remove(struct dentry *dentry)
 	mutex_lock(&parent->d_inode->i_mutex);
 	if (debugfs_positive(dentry)) {
 		if (dentry->d_inode) {
-			if (S_ISDIR(dentry->d_inode->i_mode))
-				simple_rmdir(parent->d_inode, dentry);
-			else
+			if (S_ISDIR(dentry->d_inode->i_mode)) {
+				ret = simple_rmdir(parent->d_inode, dentry);
+				if (ret)
+					printk(KERN_ERR
+						"DebugFS rmdir on %s failed : "
+						"directory not empty.\n",
+						dentry->d_name.name);
+			} else
 				simple_unlink(parent->d_inode, dentry);
-		dput(dentry);
 		}
 	}
 	mutex_unlock(&parent->d_inode->i_mutex);