Skip to content

Commit bf64913

Browse files
Matthew Wilcox (Oracle)brauner
authored andcommitted
ecryptfs: Convert lower_offset_for_page() to take a folio
Both callers have a folio, so pass it in and use folio->index instead of page->index. Signed-off-by: Matthew Wilcox (Oracle) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Christian Brauner <[email protected]>
1 parent c15b814 commit bf64913

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

fs/ecryptfs/crypto.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,10 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
328328
* Convert an eCryptfs page index into a lower byte offset
329329
*/
330330
static loff_t lower_offset_for_page(struct ecryptfs_crypt_stat *crypt_stat,
331-
struct page *page)
331+
struct folio *folio)
332332
{
333333
return ecryptfs_lower_header_size(crypt_stat) +
334-
((loff_t)page->index << PAGE_SHIFT);
334+
(loff_t)folio->index * PAGE_SIZE;
335335
}
336336

337337
/**
@@ -440,7 +440,7 @@ int ecryptfs_encrypt_page(struct folio *folio)
440440
}
441441
}
442442

443-
lower_offset = lower_offset_for_page(crypt_stat, &folio->page);
443+
lower_offset = lower_offset_for_page(crypt_stat, folio);
444444
enc_extent_virt = kmap_local_page(enc_extent_page);
445445
rc = ecryptfs_write_lower(ecryptfs_inode, enc_extent_virt, lower_offset,
446446
PAGE_SIZE);
@@ -489,7 +489,7 @@ int ecryptfs_decrypt_page(struct folio *folio)
489489
&(ecryptfs_inode_to_private(ecryptfs_inode)->crypt_stat);
490490
BUG_ON(!(crypt_stat->flags & ECRYPTFS_ENCRYPTED));
491491

492-
lower_offset = lower_offset_for_page(crypt_stat, &folio->page);
492+
lower_offset = lower_offset_for_page(crypt_stat, folio);
493493
page_virt = kmap_local_folio(folio, 0);
494494
rc = ecryptfs_read_lower(page_virt, lower_offset, PAGE_SIZE,
495495
ecryptfs_inode);

0 commit comments

Comments
 (0)