]> err.no Git - linux-2.6/commitdiff
DebugFS : file/directory removal fix
authorMathieu Desnoyers <compudj@krystal.dyndns.org>
Fri, 24 Nov 2006 18:51:14 +0000 (13:51 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 13 Dec 2006 23:38:45 +0000 (15:38 -0800)
Fix file and directory removal in debugfs. Add inotify support for file removal.

The following scenario :
create dir a
create dir a/b

cd a/b (some process goes in cwd a/b)

rmdir a/b
rmdir a

fails due to the fact that "a" appears to be non empty. It is because
the "b" dentry is not deleted from "a" and still in use. The same
problem happens if "b" is a file. d_delete is nice enough to know when
it needs to unhash and free the dentry if nothing else is using it or,
if someone is using it, to remove it from the hash queues and wait for
it to be deleted when it has no users.

The nice side-effect of this fix is that it calls the file removal
notification.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/debugfs/inode.c

index 554f4a9dfaf830b073dd7b34be9a5ee7f63badf2..c692487346eaa324fb1f1d5950a4af5a5503d184 100644 (file)
@@ -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);