From 4c7a3254039645c61def9527a3ddb0ab86c863f8 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Mon, 22 Aug 2011 14:08:51 +0100
Subject: [PATCH] --- yaml --- r: 264506 b: refs/heads/master c:
 6d528b082294f0ddabd6368297546a2c0b67d4fe h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 214fa7037390..133354b28500 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ecf1b4f347210e39b156177e5b8a26ff8d00279
+refs/heads/master: 6d528b082294f0ddabd6368297546a2c0b67d4fe
diff --git a/trunk/security/keys/keyring.c b/trunk/security/keys/keyring.c
index 30e242f7bd0e..37a7f3b28852 100644
--- a/trunk/security/keys/keyring.c
+++ b/trunk/security/keys/keyring.c
@@ -860,8 +860,7 @@ void __key_link(struct key *keyring, struct key *key,
 
 	kenter("%d,%d,%p", keyring->serial, key->serial, nklist);
 
-	klist = rcu_dereference_protected(keyring->payload.subscriptions,
-					  rwsem_is_locked(&keyring->sem));
+	klist = rcu_dereference_locked_keyring(keyring);
 
 	atomic_inc(&key->usage);