From: Eric Biggers <ebiggers@google.com>
Date: Wed, 8 Feb 2023 06:21:05 +0000 (-0800)
Subject: f2fs: stop calling fscrypt_add_test_dummy_key()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1ad2a626762dca9f3fe6954ce148f9e4fc4c1ba7;p=linux.git

f2fs: stop calling fscrypt_add_test_dummy_key()

Now that fs/crypto/ adds the test dummy encryption key on-demand when
it's needed, there's no need for individual filesystems to call
fscrypt_add_test_dummy_key().  Remove the call to it from f2fs.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20230208062107.199831-4-ebiggers@kernel.org
---

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 1f812b9ce985b..64d3556d61a55 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -540,12 +540,6 @@ static int f2fs_set_test_dummy_encryption(struct super_block *sb,
 				  opt, err);
 		return -EINVAL;
 	}
-	err = fscrypt_add_test_dummy_key(sb, policy);
-	if (err) {
-		f2fs_warn(sbi, "Error adding test dummy encryption key [%d]",
-			  err);
-		return err;
-	}
 	f2fs_warn(sbi, "Test dummy encryption mode enabled");
 	return 0;
 }