From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun, 29 May 2016 18:54:04 +0000 (-0400)
Subject: securityfs: ->d_parent is never NULL or negative
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4093d306a91f240f613f8b2c7c6843f4414adf8c;p=linux-beck.git

securityfs: ->d_parent is never NULL or negative

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/security/inode.c b/security/inode.c
index 526f82269cb0..e3df905ab5b1 100644
--- a/security/inode.c
+++ b/security/inode.c
@@ -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);