From: Eric Biggers Date: Wed, 6 Dec 2023 00:21:27 +0000 (-0800) Subject: fscrypt: update comment for do_remove_key() X-Git-Tag: v6.8-rc1~149^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0fc24a6549f9b6efc538b67a098ab577b1f9a00e;p=thirdparty%2Flinux.git fscrypt: update comment for do_remove_key() Adjust a comment that was missed during commit 15baf55481de ("fscrypt: track master key presence separately from secret"). Link: https://lore.kernel.org/r/20231206002127.14790-1-ebiggers@kernel.org Signed-off-by: Eric Biggers --- diff --git a/fs/crypto/keyring.c b/fs/crypto/keyring.c index f34a9b0b9e922..0edf0b58daa76 100644 --- a/fs/crypto/keyring.c +++ b/fs/crypto/keyring.c @@ -1002,9 +1002,9 @@ static int try_to_lock_encrypted_files(struct super_block *sb, * FS_IOC_REMOVE_ENCRYPTION_KEY_ALL_USERS (all_users=true) always removes the * key itself. * - * To "remove the key itself", first we wipe the actual master key secret, so - * that no more inodes can be unlocked with it. Then we try to evict all cached - * inodes that had been unlocked with the key. + * To "remove the key itself", first we transition the key to the "incompletely + * removed" state, so that no more inodes can be unlocked with it. Then we try + * to evict all cached inodes that had been unlocked with the key. * * If all inodes were evicted, then we unlink the fscrypt_master_key from the * keyring. Otherwise it remains in the keyring in the "incompletely removed"