summaryrefslogtreecommitdiffstats
path: root/fs/f2fs/Makefile
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2015-04-20 19:52:47 -0700
committerJaegeuk Kim <jaegeuk@kernel.org>2015-05-28 15:41:49 -0700
commit57e5055b0a5e33267b8be366ee52ce5cdc239bc7 (patch)
tree55ece877a625b61e64729edbfe5648a96051ffce /fs/f2fs/Makefile
parentf424f664f0e8949361d268e2e91c7acc8cf63eb2 (diff)
downloadlinux-57e5055b0a5e33267b8be366ee52ce5cdc239bc7.tar.bz2
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/Makefile2
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