Attachment 305682 Details for Bug 445787 – proposed fix.

[patch] proposed fix.

debugfs-dup-dir-fix.patch (text/plain), 1.60 KB, created by Josef Bacik on 2008-05-16 13:44:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Bacik

Created: 2008-05-16 13:44:20 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
>index 0388882..6ad1b27 100644
>--- a/fs/debugfs/inode.c
>+++ b/fs/debugfs/inode.c
>@@ -152,6 +152,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);
>@@ -197,13 +198,15 @@ struct dentry *debugfs_create_file(const char *name, mode_t mode,
> 
> 	pr_debug("debugfs: creating file '%s'\n",name);
> 
>-	error = simple_pin_fs(&debug_fs_type, &debugfs_mount, &debugfs_mount_count);
>+	error = simple_pin_fs(&debug_fs_type, &debugfs_mount,
>+			      &debugfs_mount_count);
> 	if (error)
> 		goto exit;
> 
> 	error = debugfs_create_by_name(name, mode, parent, &dentry);
> 	if (error) {
> 		dentry = NULL;
>+		simple_release_fs(&debugfs_mount, &debugfs_mount_count);
> 		goto exit;
> 	}
> 
>@@ -264,7 +267,8 @@ EXPORT_SYMBOL_GPL(debugfs_create_dir);
> void debugfs_remove(struct dentry *dentry)
> {
> 	struct dentry *parent;
>-	
>+	int ret = 0;
>+
> 	if (!dentry)
> 		return;
> 
>@@ -275,11 +279,14 @@ 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))
>-				simple_rmdir(parent->d_inode, dentry);
>+				ret = simple_rmdir(parent->d_inode, dentry);
> 			else
> 				simple_unlink(parent->d_inode, dentry);
>-		dput(dentry);
>+			if (!ret)
>+				d_delete(dentry);
>+			dput(dentry);
> 		}
> 	}
> 	mutex_unlock(&parent->d_inode->i_mutex);

Actions: View | Diff

Attachments on bug 445787: 304923 | 304924 | 305682