LU-15420 sec: handle simple fscrypt changes for 5.15 kernels

[fs/lustre-release.git] / lustre / llite / llite_lib.c

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index b6f98e1..e59c84a 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -526,7 +526,9 @@ retry_connect:
                        LCONSOLE_WARN("%s: server %s does not support name encryption, not using it.\n",
                                      sbi->ll_fsname,
                                      sbi->ll_md_exp->exp_obd->obd_name);
+#ifdef CONFIG_LL_ENCRYPTION
                lsi->lsi_flags &= ~LSI_FILENAME_ENC;
+#endif
                lsi->lsi_flags &= ~LSI_FILENAME_ENC_B64_OLD_CLI;
                ll_sbi_set_name_encrypt(sbi, false);
        }
@@ -1119,8 +1121,13 @@ static int ll_options(char *options, struct super_block *sb)
 #else
                        struct lustre_sb_info *lsi = s2lsi(sb);
 
-                       err = llcrypt_set_test_dummy_encryption(sb, &args[0],
-                                                               &lsi->lsi_dummy_enc_ctx);
+                       err = llcrypt_set_test_dummy_encryption(sb,
+#ifdef HAVE_FSCRYPT_SET_TEST_DUMMY_ENC_CHAR_ARG
+                                                               args->from,
+#else
+                                                               &args[0],
+#endif
+                                                               &lsi->lsi_dummy_enc_policy);
                        if (!err)
                                break;
 
@@ -1541,7 +1548,7 @@ skip_cleanup:
        }
 #endif
 
-       llcrypt_free_dummy_context(&lsi->lsi_dummy_enc_ctx);
+       llcrypt_free_dummy_policy(&lsi->lsi_dummy_enc_policy);
        ll_free_sbi(sb);
        lsi->lsi_llsbi = NULL;
 out_no_sbi: