diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2025-03-04 17:02:23 +0000 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2025-03-05 12:57:15 +0100 |
| commit | 59b59a943177e1a96d645a63d1ad824644fa848a (patch) | |
| tree | f93034bc1a9d361429a4a198eebb5cc53ccc81a3 /fs/ceph | |
| parent | ceph: Fix error handling in fill_readdir_cache() (diff) | |
| download | linux-59b59a943177e1a96d645a63d1ad824644fa848a.tar.gz linux-59b59a943177e1a96d645a63d1ad824644fa848a.zip | |
fscrypt: Change fscrypt_encrypt_pagecache_blocks() to take a folio
ext4 and ceph already have a folio to pass; f2fs needs to be properly
converted but this will do for now. This removes a reference
to page->index and page->mapping as well as removing a call to
compound_head().
Signed-off-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Link: https://lore.kernel.org/r/20250304170224.523141-1-willy@infradead.org
Acked-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/addr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c index 19efba28e461..29be367905a1 100644 --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -786,7 +786,7 @@ static int write_folio_nounlock(struct folio *folio, ceph_fscache_write_to_cache(inode, page_off, len, caching); if (IS_ENCRYPTED(inode)) { - bounce_page = fscrypt_encrypt_pagecache_blocks(&folio->page, + bounce_page = fscrypt_encrypt_pagecache_blocks(folio, CEPH_FSCRYPT_BLOCK_SIZE, 0, GFP_NOFS); if (IS_ERR(bounce_page)) { @@ -1248,7 +1248,7 @@ static inline int move_dirty_folio_in_page_array(struct address_space *mapping, gfp_t gfp_flags = ceph_wbc->locked_pages ? GFP_NOWAIT : GFP_NOFS; if (IS_ENCRYPTED(inode)) { - pages[index] = fscrypt_encrypt_pagecache_blocks(&folio->page, + pages[index] = fscrypt_encrypt_pagecache_blocks(folio, PAGE_SIZE, 0, gfp_flags); |