diff options
| author |   Jaegeuk Kim <jaegeuk@kernel.org> | 2015-04-21 16:23:47 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-28 15:41:49 -0700 |
| commit | 0adda907f23df2e19355b58a20f0a7ff76587c6a (patch) | |
| tree | 1ab172e639f055eddf80b6e679ba07445625e8c9 /fs/f2fs/Makefile | |
| parent | f2fs crypto: add f2fs encryption facilities (diff) | |
| download | linux-dev-0adda907f23df2e19355b58a20f0a7ff76587c6a.tar.xz linux-dev-0adda907f23df2e19355b58a20f0a7ff76587c6a.zip | |
f2fs crypto: add encryption key management facilities
This patch copies from encrypt_key.c in ext4, and modifies for f2fs.
Use GFP_NOFS, since _f2fs_get_encryption_info is called under f2fs_lock_op.
Signed-off-by: Michael Halcrow <mhalcrow@google.com>
Signed-off-by: Ildar Muslukhov <muslukhovi@gmail.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 a79907b4f9f5..b08925d34ed0 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 crypto.o +f2fs-$(CONFIG_F2FS_FS_ENCRYPTION) += crypto_policy.o crypto.o crypto_key.o |