From: David Howells <dhowells@redhat.com>
Date: Mon, 8 Aug 2011 14:54:53 +0000 (+0100)
Subject: CRED: Restore const to current_cred()
X-Git-Tag: upstream/snapshot3+hdmi~9307
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27e4e4362756a78b15e83ef104c8bbe257f40f90;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/include/linux/cred.h b/include/linux/cred.h
index 98f46ef..8e2fd44 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