Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index d6c5fb53c746cc79a8aedbc47cab7e6fe9ada364..c692487346eaa324fb1f1d5950a4af5a5503d184 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/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,19 @@ 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
+                       dget(dentry);
+                       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);
+                       if (!ret)
+                               d_delete(dentry);
+                       dput(dentry);
                }
        }
        mutex_unlock(&parent->d_inode->i_mutex);