Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 44564
b: refs/heads/master
c: 29a7f3a
h: refs/heads/master
v: v3
  • Loading branch information
Mathieu Desnoyers authored and Greg Kroah-Hartman committed Dec 13, 2006
1 parent a5b11c0 commit 510c336
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 65c333367b1aea57d58168ad3dc1df27b0227401
refs/heads/master: 29a7f3ada7fea5510504c5359c3f70d109aeb055
4 changes: 4 additions & 0 deletions trunk/fs/debugfs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down

0 comments on commit 510c336

Please sign in to comment.