diff options
| author | James Morris <jmorris@namei.org> | 2009-06-18 18:20:55 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-18 18:20:55 -0400 |
| commit | d905163c5b23f6d8511971e06081a1b525e8a0bd (patch) | |
| tree | f76918c1be802ec068d37763466f5518efdb690e /security/inode.c | |
| parent | 44c2d9bdd7022ca7d240d5adc009296fc1c6ce08 (diff) | |
| parent | 0732f87761dbe417cb6e084b712d07e879e876ef (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/inode.c')
| -rw-r--r-- | security/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/inode.c b/security/inode.c index f3b91bfbe4cb..f7496c6a022b 100644 --- a/security/inode.c +++ b/security/inode.c | |||
| @@ -287,7 +287,7 @@ void securityfs_remove(struct dentry *dentry) | |||
| 287 | { | 287 | { |
| 288 | struct dentry *parent; | 288 | struct dentry *parent; |
| 289 | 289 | ||
| 290 | if (!dentry) | 290 | if (!dentry || IS_ERR(dentry)) |
| 291 | return; | 291 | return; |
| 292 | 292 | ||
| 293 | parent = dentry->d_parent; | 293 | parent = dentry->d_parent; |