From 32cb760e160e19ec7c2ceafdf1ab08b1a8e71ff3 Mon Sep 17 00:00:00 2001
From: Jan Kara <jack@suse.cz>
Date: Tue, 3 Jan 2012 13:14:29 +0100
Subject: [PATCH] --- yaml --- r: 277093 b: refs/heads/master c:
 30e053248da178cf6154bb7e950dc8713567e3fa h: refs/heads/master i:   277091:
 25639a7bdd78d934d6b14c588f784ab9be618732 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/security.h | 2 +-
 trunk/security/security.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9fdb6b7318e7..da250a8ada11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4376eee92e5a8332b470040e672ea99cd44c826a
+refs/heads/master: 30e053248da178cf6154bb7e950dc8713567e3fa
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index 19d8e04e1688..e8c619d39291 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -2056,7 +2056,7 @@ static inline int security_old_inode_init_security(struct inode *inode,
 						   char **name, void **value,
 						   size_t *len)
 {
-	return 0;
+	return -EOPNOTSUPP;
 }
 
 static inline int security_inode_create(struct inode *dir,
diff --git a/trunk/security/security.c b/trunk/security/security.c
index 0c6cc69c8f86..e2f684aeb70c 100644
--- a/trunk/security/security.c
+++ b/trunk/security/security.c
@@ -381,7 +381,7 @@ int security_old_inode_init_security(struct inode *inode, struct inode *dir,
 				     void **value, size_t *len)
 {
 	if (unlikely(IS_PRIVATE(inode)))
-		return 0;
+		return -EOPNOTSUPP;
 	return security_ops->inode_init_security(inode, dir, qstr, name, value,
 						 len);
 }