Merge tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel...

Pull fscrypto fixes from Ted Ts'o:
 "A code cleanup and bugfix for fs/crypto"

* tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: eliminate ->prepare_context() operation
  fscrypt: remove broken support for detecting keyring key revocation

diff --cc fs/crypto/keyinfo.c
index d5d896fa5a71675272131d797919924b2398a85a,cb3e82abf0347b9d395bb167955c9e92801d1b41..8cdfddce2b34868f0cfe3f71da55d64187172a38
--- 1/fs/crypto/keyinfo.c
--- 2/fs/crypto/keyinfo.c
+++ b/fs/crypto/keyinfo.c
@@@ -102,11 -103,9 +103,9 @@@ static int validate_user_key(struct fsc
                res = -ENOKEY;
                goto out;
        }
-       down_read(&keyring_key->sem);
 -      ukp = user_key_payload(keyring_key);
 +      ukp = user_key_payload_locked(keyring_key);
        if (ukp->datalen != sizeof(struct fscrypt_key)) {
                res = -EINVAL;
-               up_read(&keyring_key->sem);
                goto out;
        }
        master_key = (struct fscrypt_key *)ukp->data;