summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-08-08 16:54:53 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-08 18:03:16 +0200
commit27e4e4362756a78b15e83ef104c8bbe257f40f90 (patch)
treee94ce9e5540cc8e2ae9a06aa398bc16a364c29b2 /include
parentLinux 3.1-rc1 (diff)
downloadlinux-27e4e4362756a78b15e83ef104c8bbe257f40f90.tar.xz
linux-27e4e4362756a78b15e83ef104c8bbe257f40f90.zip
CRED: Restore const to current_cred()
Commit 3295514841c2 ("fix rcu annotations noise in cred.h") accidentally dropped the const of current->cred inside current_cred() by the insertion of a cast to deal with an RCU annotation loss warning from sparce. Use an appropriate RCU wrapper instead so as not to lose the const. Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cred.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 98f46efbe2d2..8e2fd44eb160 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -269,7 +269,7 @@ static inline void put_cred(const struct cred *_cred)
* since nobody else can modify it.
*/
#define current_cred() \
- (*(__force struct cred **)&current->cred)
+ rcu_dereference_protected(current->cred, 1)
/**
* __task_cred - Access a task's objective credentials