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/buffer.c | |
| parent | Merge tag 'v6.4-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/... (diff) | |
| parent | fscrypt: optimize fscrypt_initialize() (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/buffer.c')
| -rw-r--r-- | fs/buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 10390f53f3f5..737e3eff6259 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -331,8 +331,8 @@ static void decrypt_bh(struct work_struct *work) struct buffer_head *bh = ctx->bh; int err; - err = fscrypt_decrypt_pagecache_blocks(page_folio(bh->b_page), - bh->b_size, bh_offset(bh)); + err = fscrypt_decrypt_pagecache_blocks(bh->b_folio, bh->b_size, + bh_offset(bh)); if (err == 0 && need_fsverity(bh)) { /* * We use different work queues for decryption and for verity |