diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 15:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-25 15:36:56 -0700 |
| commit | a643f9054c21f4fae0fbb4add663462fea7a47f0 (patch) | |
| tree | 24b280c94f6499a175e1a2d2267b8c27ef8c8bbf /fs/ext4 | |
| parent | a00da40fc7a4f5000302d003dd469f132f7dfa55 (diff) | |
| parent | 94840e3c802daa1a62985957f36ac48faf8ceedd (diff) | |
| download | linux-a643f9054c21f4fae0fbb4add663462fea7a47f0.tar.gz linux-a643f9054c21f4fae0fbb4add663462fea7a47f0.tar.bz2 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 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2e03a0a88d92..a9448db1cf7e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1120,17 +1120,16 @@ static int ext4_get_context(struct inode *inode, void *ctx, size_t len) EXT4_XATTR_NAME_ENCRYPTION_CONTEXT, ctx, len); } -static int ext4_prepare_context(struct inode *inode) -{ - return ext4_convert_inline_data(inode); -} - static int ext4_set_context(struct inode *inode, const void *ctx, size_t len, void *fs_data) { handle_t *handle = fs_data; int res, res2, retries = 0; + res = ext4_convert_inline_data(inode); + if (res) + return res; + /* * If a journal handle was specified, then the encryption context is * being set on a new inode via inheritance and is part of a larger @@ -1196,7 +1195,6 @@ static unsigned ext4_max_namelen(struct inode *inode) static const struct fscrypt_operations ext4_cryptops = { .key_prefix = "ext4:", .get_context = ext4_get_context, - .prepare_context = ext4_prepare_context, .set_context = ext4_set_context, .dummy_context = ext4_dummy_context, .is_encrypted = ext4_encrypted_inode, |