summaryrefslogtreecommitdiffstats
path: root/fs/ext4/ext4.h
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@google.com>2015-04-12 06:55:06 +0200
committerTheodore Ts'o <tytso@mit.edu>2015-04-12 06:55:06 +0200
commit88bd6ccdcdd638faa11e9746affc21d5f2fe2acf (patch)
tree1c86a994b5273756f6c90627af2131d8bc616481 /fs/ext4/ext4.h
parentext4 crypto: add ext4 encryption facilities (diff)
downloadlinux-88bd6ccdcdd638faa11e9746affc21d5f2fe2acf.tar.xz
linux-88bd6ccdcdd638faa11e9746affc21d5f2fe2acf.zip
ext4 crypto: add encryption key management facilities
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>
Diffstat (limited to 'fs/ext4/ext4.h')
-rw-r--r--fs/ext4/ext4.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 71619ef72225..99a2d67f65b7 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2078,6 +2078,19 @@ static inline int ext4_sb_has_crypto(struct super_block *sb)
}
#endif
+/* crypto_key.c */
+int ext4_generate_encryption_key(struct inode *inode);
+
+#ifdef CONFIG_EXT4_FS_ENCRYPTION
+int ext4_has_encryption_key(struct inode *inode);
+#else
+static inline int ext4_has_encryption_key(struct inode *inode)
+{
+ return 0;
+}
+#endif
+
+
/* dir.c */
extern int __ext4_check_dir_entry(const char *, unsigned int, struct inode *,
struct file *,