From 66f650379fed8058873d7564c28393bdaaa6d828 Mon Sep 17 00:00:00 2001
From: Mimi Zohar <zohar@linux.vnet.ibm.com>
Date: Tue, 17 Jan 2012 20:40:02 +0000
Subject: [PATCH] --- yaml --- r: 286079 b: refs/heads/master c:
 6ac6172a935d1faf7ef259802267657bc0007a62 h: refs/heads/master i:   286077:
 7b50713d3300386049dd51137b7fefcd1d3e46d6   286075:
 f75dbe81131e32cf11795b38f7a225a0c09d2b79   286071:
 61932c9bdb80a5c6a5b7575f687a7e40650d53c5   286063:
 873641b4b60c24e921699652361de2298d649438   286047:
 e5769525ee7b1a0458f65176ce927c83dcf9e4af   286015:
 17fe31d16f5c3253b89967ab87ff31c5eed03383   285951:
 010a20829a6859ecc11c33b688d0d0a9ecadf557 v: v3

---
 [refs]                                                 | 2 +-
 trunk/security/keys/encrypted-keys/encrypted.c         | 2 +-
 trunk/security/keys/encrypted-keys/masterkey_trusted.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e6a9d9d5d7c8..0b6d92006e49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee0b31a25a010116f44fca6c96f4516d417793dd
+refs/heads/master: 6ac6172a935d1faf7ef259802267657bc0007a62
diff --git a/trunk/security/keys/encrypted-keys/encrypted.c b/trunk/security/keys/encrypted-keys/encrypted.c
index d91efb6901e9..2d1bb8af7696 100644
--- a/trunk/security/keys/encrypted-keys/encrypted.c
+++ b/trunk/security/keys/encrypted-keys/encrypted.c
@@ -314,7 +314,7 @@ static struct key *request_user_key(const char *master_desc, u8 **master_key,
 		goto error;
 
 	down_read(&ukey->sem);
-	upayload = rcu_dereference(ukey->payload.data);
+	upayload = ukey->payload.data;
 	*master_key = upayload->data;
 	*master_keylen = upayload->datalen;
 error:
diff --git a/trunk/security/keys/encrypted-keys/masterkey_trusted.c b/trunk/security/keys/encrypted-keys/masterkey_trusted.c
index 8c16c3e472e7..013f7e5d3a2f 100644
--- a/trunk/security/keys/encrypted-keys/masterkey_trusted.c
+++ b/trunk/security/keys/encrypted-keys/masterkey_trusted.c
@@ -39,7 +39,7 @@ struct key *request_trusted_key(const char *trusted_desc,
 		goto error;
 
 	down_read(&tkey->sem);
-	tpayload = rcu_dereference(tkey->payload.data);
+	tpayload = tkey->payload.data;
 	*master_key = tpayload->key;
 	*master_keylen = tpayload->key_len;
 error: