Merge tag 'for-f2fs-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[platform/kernel/linux-exynos.git] / include / linux / fscrypto.h

diff --git a/include/linux/fscrypto.h b/include/linux/fscrypto.h
index 895cdac..cd91f75 100644 (file)
--- a/include/linux/fscrypto.h
+++ b/include/linux/fscrypto.h
@@ -15,6 +15,7 @@
 #include <linux/mm.h>
 #include <linux/bio.h>
 #include <linux/dcache.h>
+#include <crypto/skcipher.h>
 #include <uapi/linux/fs.h>
 
 #define FS_KEY_DERIVATION_NONCE_SIZE           16
@@ -77,7 +78,7 @@ struct fscrypt_info {
        u8 ci_data_mode;
        u8 ci_filename_mode;
        u8 ci_flags;
-       struct crypto_ablkcipher *ci_ctfm;
+       struct crypto_skcipher *ci_ctfm;
        struct key *ci_keyring_key;
        u8 ci_master_key[FS_KEY_DESCRIPTOR_SIZE];
 };