From 95e7c877c449e6df2a39c1addae589f14c6b0d2f Mon Sep 17 00:00:00 2001 From: James Morris Date: Fri, 3 Dec 2010 08:21:01 +1100 Subject: [PATCH] --- yaml --- r: 227793 b: refs/heads/master c: fe27d4b012273640e033be80f143bdc54daa8e16 h: refs/heads/master i: 227791: 5f3a3914ee68fb5de1f0e1c6aecb5f214ca0341d v: v3 --- [refs] | 2 +- trunk/include/linux/security.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c18f879f1351..255915f4aec1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 676dac4b1bee0469d6932f698aeb77e8489f5861 +refs/heads/master: fe27d4b012273640e033be80f143bdc54daa8e16 diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index fd4d55fb8845..e7d89b0c1fd8 100644 --- a/trunk/include/linux/security.h +++ b/trunk/include/linux/security.h @@ -1058,8 +1058,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) * @cred points to the credentials to provide the context against which to * evaluate the security data on the key. * @perm describes the combination of permissions required of this key. - * Return 1 if permission granted, 0 if permission denied and -ve it the - * normal permissions model should be effected. + * Return 0 if permission is granted, -ve error otherwise. * @key_getsecurity: * Get a textual representation of the security context attached to a key * for the purposes of honouring KEYCTL_GETSECURITY. This function