Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[cascardo/linux.git] / security / inode.c

diff --git a/security/inode.c b/security/inode.c
index a09639b..acc3e9c 100644 (file)
--- a/security/inode.c
+++ b/security/inode.c
@@ -185,24 +185,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;
 
-       parent = dentry->d_parent;
-       if (!parent || d_really_is_negative(parent))
-               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);