diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-26 08:37:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-26 08:37:51 -0700 |
commit | dbe0e78d0e3a83dd924ea01bebf6c45313c81607 (patch) | |
tree | 69a1261c76fd7451c7f97a3ba55649187aba98a4 /fs/crypto/policy.c | |
parent | 733f7e9c18c5e377025c1bfdce6bc9a7d55649be (diff) | |
parent | 83e57e47906ce0e99bd61c70fae514e69960d274 (diff) | |
download | linux-dbe0e78d0e3a83dd924ea01bebf6c45313c81607.tar.gz linux-dbe0e78d0e3a83dd924ea01bebf6c45313c81607.tar.bz2 linux-dbe0e78d0e3a83dd924ea01bebf6c45313c81607.zip |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"A few cleanups for fs/crypto/, and another patch to prepare for the
upcoming CephFS encryption support"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: optimize fscrypt_initialize()
fscrypt: use WARN_ON_ONCE instead of WARN_ON
fscrypt: new helper function - fscrypt_prepare_lookup_partial()
fs/buffer.c: use b_folio for fscrypt work
Diffstat (limited to 'fs/crypto/policy.c')
-rw-r--r-- | fs/crypto/policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c index 3b5fcb6402ea..f4456ecb3f87 100644 --- a/fs/crypto/policy.c +++ b/fs/crypto/policy.c @@ -48,7 +48,7 @@ int fscrypt_policy_to_key_spec(const union fscrypt_policy *policy, FSCRYPT_KEY_IDENTIFIER_SIZE); return 0; default: - WARN_ON(1); + WARN_ON_ONCE(1); return -EINVAL; } } @@ -463,7 +463,7 @@ static int set_encryption_policy(struct inode *inode, current->comm, current->pid); break; default: - WARN_ON(1); + WARN_ON_ONCE(1); return -EINVAL; } |