Merge branch 'nfs-for-3.1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / security / keys / keyring.c

diff --git a/security/keys/keyring.c b/security/keys/keyring.c
index a06ffab38568809f5187970261888d6a9e673f18..30e242f7bd0ec413bca908f1a0fdc5398b00a124 100644 (file)
--- a/security/keys/keyring.c
+++ b/security/keys/keyring.c
@@ -155,7 +155,6 @@ static void keyring_destroy(struct key *keyring)
        }
 
        klist = rcu_dereference_check(keyring->payload.subscriptions,
-                                     rcu_read_lock_held() ||
                                      atomic_read(&keyring->usage) == 0);
        if (klist) {
                for (loop = klist->nkeys - 1; loop >= 0; loop--)