diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 23:36:56 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 23:36:56 +0100 |
| commit | a643f9054c21f4fae0fbb4add663462fea7a47f0 (patch) | |
| tree | 24b280c94f6499a175e1a2d2267b8c27ef8c8bbf /include | |
| parent | Merge tag 'hwmon-for-linus-v4.11-rc4' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | fscrypt: eliminate ->prepare_context() operation (diff) | |
| download | linux-a643f9054c21f4fae0fbb4add663462fea7a47f0.tar.xz linux-a643f9054c21f4fae0fbb4add663462fea7a47f0.zip | |
Merge tag 'fscrypt-for-linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fscrypt_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/fscrypt_common.h b/include/linux/fscrypt_common.h index 547f81592ba1..10c1abfbac6c 100644 --- a/include/linux/fscrypt_common.h +++ b/include/linux/fscrypt_common.h @@ -87,7 +87,6 @@ struct fscrypt_operations { unsigned int flags; const char *key_prefix; int (*get_context)(struct inode *, void *, size_t); - int (*prepare_context)(struct inode *); int (*set_context)(struct inode *, const void *, size_t, void *); int (*dummy_context)(struct inode *); bool (*is_encrypted)(struct inode *); |