diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-09-29 15:33:50 -0700 |
| commit | d60ac92c105fd8c09224b92c3e34dd03327ba3f4 (patch) | |
| tree | b1c3ef3f277aa48370f590341166d4425b30cab6 /fs/crypto/bio.c | |
| parent | Merge tag 'dlm-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/teiglan... (diff) | |
| parent | fscrypt: use HMAC-SHA512 library for HKDF (diff) | |
| download | linux-d60ac92c105fd8c09224b92c3e34dd03327ba3f4.tar.gz linux-d60ac92c105fd8c09224b92c3e34dd03327ba3f4.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux
Pull fscrypt updates from Eric Biggers:
"Make fs/crypto/ use the HMAC-SHA512 library functions instead of
crypto_shash.
This is simpler, faster, and more reliable"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/linux:
fscrypt: use HMAC-SHA512 library for HKDF
fscrypt: Remove redundant __GFP_NOWARN
Diffstat (limited to 'fs/crypto/bio.c')
| -rw-r--r-- | fs/crypto/bio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/bio.c b/fs/crypto/bio.c index 0d746de4cd10..5f5599020e94 100644 --- a/fs/crypto/bio.c +++ b/fs/crypto/bio.c @@ -148,7 +148,7 @@ int fscrypt_zeroout_range(const struct inode *inode, pgoff_t lblk, */ for (i = 0; i < nr_pages; i++) { pages[i] = fscrypt_alloc_bounce_page(i == 0 ? GFP_NOFS : - GFP_NOWAIT | __GFP_NOWARN); + GFP_NOWAIT); if (!pages[i]) break; } |