diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 18:22:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-20 18:22:31 -0800 |
| commit | 6c24337f22115d669e24ce990842dab667371b4d (patch) | |
| tree | 44c41adb55182c4fe833935f3b346ed7ad7e29ca /fs/ext4/page-io.c | |
| parent | 786856b6d111a30d51c98526cc7a283ecc73f00f (diff) | |
| parent | 6f69f0ed6136c302976f8e8f859b73d47f0c0c5c (diff) | |
| download | linux-6c24337f22115d669e24ce990842dab667371b4d.tar.gz linux-6c24337f22115d669e24ce990842dab667371b4d.tar.bz2 linux-6c24337f22115d669e24ce990842dab667371b4d.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:
"Various cleanups for the file system encryption feature"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
fscrypt: constify struct fscrypt_operations
fscrypt: properly declare on-stack completion
fscrypt: split supp and notsupp declarations into their own headers
fscrypt: remove redundant assignment of res
fscrypt: make fscrypt_operations.key_prefix a string
fscrypt: remove unused 'mode' member of fscrypt_ctx
ext4: don't allow encrypted operations without keys
fscrypt: make test_dummy_encryption require a keyring key
fscrypt: factor out bio specific functions
fscrypt: pass up error codes from ->get_context()
fscrypt: remove user-triggerable warning messages
fscrypt: use EEXIST when file already uses different policy
fscrypt: use ENOTDIR when setting encryption policy on nondirectory
fscrypt: use ENOKEY when file cannot be created w/o key
Diffstat (limited to 'fs/ext4/page-io.c')
| -rw-r--r-- | fs/ext4/page-io.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index d83b0f3c5fe9..e55624c50898 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c @@ -24,7 +24,6 @@ #include <linux/slab.h> #include <linux/mm.h> #include <linux/backing-dev.h> -#include <linux/fscrypto.h> #include "ext4_jbd2.h" #include "xattr.h" |