diff options
| author |   Jaegeuk Kim <jaegeuk@kernel.org> | 2015-04-20 19:52:47 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-28 15:41:49 -0700 |
| commit | 57e5055b0a5e33267b8be366ee52ce5cdc239bc7 (patch) | |
| tree | 55ece877a625b61e64729edbfe5648a96051ffce /fs/f2fs/Makefile | |
| parent | f2fs crypto: add encryption policy and password salt support (diff) | |
| download | linux-dev-57e5055b0a5e33267b8be366ee52ce5cdc239bc7.tar.xz linux-dev-57e5055b0a5e33267b8be366ee52ce5cdc239bc7.zip | |
f2fs crypto: add f2fs encryption facilities
Most of parts were copied from ext4, except:
- add f2fs_restore_and_release_control_page which returns control page and
restore control page
- remove ext4_encrypted_zeroout()
- remove sbi->s_file_encryption_mode & sbi->s_dir_encryption_mode
- add f2fs_end_io_crypto_work for mpage_end_io
Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Signed-off-by: Ildar Muslukhov <ildarm@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/Makefile')
| -rw-r--r-- | fs/f2fs/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/Makefile b/fs/f2fs/Makefile index 7864f4f02ca6..a79907b4f9f5 100644 --- a/fs/f2fs/Makefile +++ b/fs/f2fs/Makefile @@ -6,4 +6,4 @@ f2fs-$(CONFIG_F2FS_STAT_FS) += debug.o f2fs-$(CONFIG_F2FS_FS_XATTR) += xattr.o f2fs-$(CONFIG_F2FS_FS_POSIX_ACL) += acl.o f2fs-$(CONFIG_F2FS_IO_TRACE) += trace.o -f2fs-$(CONFIG_F2FS_FS_ENCRYPTION) += crypto_policy.o +f2fs-$(CONFIG_F2FS_FS_ENCRYPTION) += crypto_policy.o crypto.o |