From 47af2521e68c3c75a458650cb1dd231c0fcd19ce Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 22 Dec 2010 16:24:13 +0000
Subject: [PATCH] --- yaml --- r: 223543 b: refs/heads/master c:
 3fc5e98d8cf85e0d77fc597b49e9268dff67400e h: refs/heads/master i:   223541:
 732a84d5e907d647bf10de11d92f8c83f5734057   223539:
 c5a08ee21d792acab70e28ae89cd450c2d371a87   223535:
 75c61e68806b9807ff50d434d4e19c6134983fda v: v3

---
 [refs]                            | 2 +-
 trunk/security/keys/request_key.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 58143c8e0d4f..e49a520a6e1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44658a11f312fb9217674cb90b1a11cbe17fd18d
+refs/heads/master: 3fc5e98d8cf85e0d77fc597b49e9268dff67400e
diff --git a/trunk/security/keys/request_key.c b/trunk/security/keys/request_key.c
index 0088dd8bf68a..0ea52d25a6bd 100644
--- a/trunk/security/keys/request_key.c
+++ b/trunk/security/keys/request_key.c
@@ -403,7 +403,6 @@ static int construct_alloc_key(struct key_type *type,
 	return ret;
 
 link_prealloc_failed:
-	up_write(&dest_keyring->sem);
 	mutex_unlock(&user->cons_lock);
 	kleave(" = %d [prelink]", ret);
 	return ret;