diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2017-07-09 09:03:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2017-07-09 09:03:31 -0700 |
| commit | 58f587cb0b603de3d8869e021d4fa704e065afa8 (patch) | |
| tree | a95c09d1a00737f2cb86466a1a1770b09d60b71e /fs/ext4 | |
| parent | Merge branch 'waitid-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/vi... (diff) | |
| parent | fscrypt: make ->dummy_context() return bool (diff) | |
| download | linux-58f587cb0b603de3d8869e021d4fa704e065afa8.tar.gz linux-58f587cb0b603de3d8869e021d4fa704e065afa8.tar.bz2 linux-58f587cb0b603de3d8869e021d4fa704e065afa8.zip | |
Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o:
"Add support for 128-bit AES and some cleanups to fscrypt"
* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: make ->dummy_context() return bool
fscrypt: add support for AES-128-CBC
fscrypt: inline fscrypt_free_filename()
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 9006cb5857b8..18f68f09d393 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1203,7 +1203,7 @@ retry: return res; } -static int ext4_dummy_context(struct inode *inode) +static bool ext4_dummy_context(struct inode *inode) { return DUMMY_ENCRYPTION_ENABLED(EXT4_SB(inode->i_sb)); } |