@@ -328,10 +328,10 @@ static int crypt_scatterlist(struct ecryptfs_crypt_stat *crypt_stat,
328
328
* Convert an eCryptfs page index into a lower byte offset
329
329
*/
330
330
static loff_t lower_offset_for_page (struct ecryptfs_crypt_stat * crypt_stat ,
331
- struct page * page )
331
+ struct folio * folio )
332
332
{
333
333
return ecryptfs_lower_header_size (crypt_stat ) +
334
- (( loff_t )page -> index << PAGE_SHIFT ) ;
334
+ (loff_t )folio -> index * PAGE_SIZE ;
335
335
}
336
336
337
337
/**
@@ -440,7 +440,7 @@ int ecryptfs_encrypt_page(struct folio *folio)
440
440
}
441
441
}
442
442
443
- lower_offset = lower_offset_for_page (crypt_stat , & folio -> page );
443
+ lower_offset = lower_offset_for_page (crypt_stat , folio );
444
444
enc_extent_virt = kmap_local_page (enc_extent_page );
445
445
rc = ecryptfs_write_lower (ecryptfs_inode , enc_extent_virt , lower_offset ,
446
446
PAGE_SIZE );
@@ -489,7 +489,7 @@ int ecryptfs_decrypt_page(struct folio *folio)
489
489
& (ecryptfs_inode_to_private (ecryptfs_inode )-> crypt_stat );
490
490
BUG_ON (!(crypt_stat -> flags & ECRYPTFS_ENCRYPTED ));
491
491
492
- lower_offset = lower_offset_for_page (crypt_stat , & folio -> page );
492
+ lower_offset = lower_offset_for_page (crypt_stat , folio );
493
493
page_virt = kmap_local_folio (folio , 0 );
494
494
rc = ecryptfs_read_lower (page_virt , lower_offset , PAGE_SIZE ,
495
495
ecryptfs_inode );
0 commit comments