diff options
| author | Eric Biggers <ebiggers@google.com> | 2020-09-24 07:26:23 +0300 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-09-24 07:29:49 +0300 |
| commit | 70fb2612aab62d47e03f82eaa7384a8d30ca175d (patch) | |
| tree | b5bb95edeeedc20ad954dc9c56d9285d6cb717df /fs/f2fs | |
| parent | 0c6a113b2446e7d4c6b8222fe63518dc2e01e8c1 (diff) | |
| download | linux-70fb2612aab62d47e03f82eaa7384a8d30ca175d.tar.xz | |
fscrypt: don't call no-key names "ciphertext names"
Currently we're using the term "ciphertext name" ambiguously because it
can mean either the actual ciphertext filename, or the encoded filename
that is shown when an encrypted directory is listed without its key.
The latter we're now usually calling the "no-key name"; and while it's
derived from the ciphertext name, it's not the same thing.
To avoid this ambiguity, rename fscrypt_name::is_ciphertext_name to
fscrypt_name::is_nokey_name, and update comments that say "ciphertext
name" (or "encrypted name") to say "no-key name" instead when warranted.
Link: https://lore.kernel.org/r/20200924042624.98439-2-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/f2fs')
| -rw-r--r-- | fs/f2fs/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 414bc94fbd54..53fbc4dd6e48 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -111,7 +111,7 @@ static int __f2fs_setup_filename(const struct inode *dir, #ifdef CONFIG_FS_ENCRYPTION fname->crypto_buf = crypt_name->crypto_buf; #endif - if (crypt_name->is_ciphertext_name) { + if (crypt_name->is_nokey_name) { /* hash was decoded from the no-key name */ fname->hash = cpu_to_le32(crypt_name->hash); } else { |