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 branch 'linus' into tracing/urgent
[linux-2.6-block.git]
/
security
/
inode.c
diff --git
a/security/inode.c
b/security/inode.c
index f3b91bfbe4cb9483ea55e7e64c5c1c52b8c71d0d..f7496c6a022b7c2213f061c17b435bf0328085ed 100644
(file)
--- a/
security/inode.c
+++ b/
security/inode.c
@@
-287,7
+287,7
@@
void securityfs_remove(struct dentry *dentry)
{
struct dentry *parent;
- if (!dentry)
+ if (!dentry
|| IS_ERR(dentry)
)
return;
parent = dentry->d_parent;