From a81e8d264c8c9aa0621a7549fdb6543e54fdb723 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Mon, 11 May 2009 20:47:15 -0400
Subject: [PATCH] --- yaml --- r: 146427 b: refs/heads/master c:
 d93e4c940f51ae06b59c14523c4d55947f9597d6 h: refs/heads/master i:   146425:
 77e93ca8598c4a13d633f56699a53e8467754a46   146423:
 d49f0b14867f0a6527de4d7a553e4b26150ff297 v: v3

---
 [refs]                 | 2 +-
 trunk/security/inode.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 341f54c58fa7..8653af6ab82a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a62e958fa4aaeeb752311b4f5e16b2a86737b23
+refs/heads/master: d93e4c940f51ae06b59c14523c4d55947f9597d6
diff --git a/trunk/security/inode.c b/trunk/security/inode.c
index f3b91bfbe4cb..f7496c6a022b 100644
--- a/trunk/security/inode.c
+++ b/trunk/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;