Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / crypto / fscrypt_private.h

diff --git a/fs/crypto/fscrypt_private.h b/fs/crypto/fscrypt_private.h
index 6b4c8094cc7b084e22dfc2fca0a1fbfd0682951f..3afdaa0847736b1d28b50cc4417db864c787d4ca 100644 (file)
--- a/fs/crypto/fscrypt_private.h
+++ b/fs/crypto/fscrypt_private.h
@@ -31,7 +31,7 @@
 #define FSCRYPT_CONTEXT_V2     2
 
 /* Keep this in sync with include/uapi/linux/fscrypt.h */
-#define FSCRYPT_MODE_MAX       FSCRYPT_MODE_ADIANTUM
+#define FSCRYPT_MODE_MAX       FSCRYPT_MODE_AES_256_HCTR2
 
 struct fscrypt_context_v1 {
        u8 version; /* FSCRYPT_CONTEXT_V1 */
@@ -297,14 +297,11 @@ void fscrypt_generate_iv(union fscrypt_iv *iv, u64 lblk_num,
                         const struct fscrypt_info *ci);
 
 /* fname.c */
-int fscrypt_fname_encrypt(const struct inode *inode, const struct qstr *iname,
-                         u8 *out, unsigned int olen);
-bool fscrypt_fname_encrypted_size(const union fscrypt_policy *policy,
-                                 u32 orig_len, u32 max_len,
-                                 u32 *encrypted_len_ret);
+bool __fscrypt_fname_encrypted_size(const union fscrypt_policy *policy,
+                                   u32 orig_len, u32 max_len,
+                                   u32 *encrypted_len_ret);
 
 /* hkdf.c */
-
 struct fscrypt_hkdf {
        struct crypto_shash *hmac_tfm;
 };