1
0
Fork 0

securityfs: ->d_parent is never NULL or negative

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
steinar/wifi_calib_4_9_kernel
Al Viro 2016-05-29 14:54:04 -04:00
parent 07a8e62fde
commit 4093d306a9
1 changed files with 6 additions and 5 deletions

View File

@ -186,20 +186,21 @@ EXPORT_SYMBOL_GPL(securityfs_create_dir);
*/
void securityfs_remove(struct dentry *dentry)
{
struct dentry *parent;
struct inode *dir;
if (!dentry || IS_ERR(dentry))
return;
inode_lock(d_inode(parent));
dir = d_inode(dentry->d_parent);
inode_lock(dir);
if (simple_positive(dentry)) {
if (d_is_dir(dentry))
simple_rmdir(d_inode(parent), dentry);
simple_rmdir(dir, dentry);
else
simple_unlink(d_inode(parent), dentry);
simple_unlink(dir, dentry);
dput(dentry);
}
inode_unlock(d_inode(parent));
inode_unlock(dir);
simple_release_fs(&mount, &mount_count);
}
EXPORT_SYMBOL_GPL(securityfs_remove);