Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-01-04 21:35:43 -05:00 · 2012-01-04 21:35:43 -05:00 · 117ff42fd4
commit 117ff42fd4
parent 1d5783030a 805a6af8db
18 changed files with 99 additions and 86 deletions
--- a/include/linux/security.h
+++ b/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,