projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-linus
[linux-2.6-block.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index 8e7ca62078abe85f988a90b796f265fc2172d526..131a3c49f766444f167f88d19b712ef80ee47a66 100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-203,7
+203,7
@@
void securityfs_remove(struct dentry *dentry)
mutex_lock(&parent->d_inode->i_mutex);
if (positive(dentry)) {
if (dentry->d_inode) {
- if (
S_ISDIR(dentry->d_inode->i_mode
))
+ if (
d_is_dir(dentry
))
simple_rmdir(parent->d_inode, dentry);
else
simple_unlink(parent->d_inode, dentry);