Commit 025e65c3 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

ecryptfs: Convert ecryptfs to read_folio 



This is a "weak" conversion which converts straight back to using pages.
A full conversion should be performed at some point, hopefully by
someone familiar with the filesystem.

Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
parent 5aab331a

fs/ecryptfs/mmap.c

+6 −5
Original line number Diff line number Diff line
@@ -170,16 +170,17 @@ ecryptfs_copy_up_encrypted_with_header(struct page *page, 
}



/**

 * ecryptfs_readpage

 * ecryptfs_read_folio

 * @file: An eCryptfs file

 * @page: Page from eCryptfs inode mapping into which to stick the read data

 * @folio: Folio from eCryptfs inode mapping into which to stick the read data

 *

 * Read in a page, decrypting if necessary.

 * Read in a folio, decrypting if necessary.

 *

 * Returns zero on success; non-zero on error.

 */

static int ecryptfs_readpage(struct file *file, struct page *page)

static int ecryptfs_read_folio(struct file *file, struct folio *folio)

{

	struct page *page = &folio->page;

	struct ecryptfs_crypt_stat *crypt_stat =

		&ecryptfs_inode_to_private(page->mapping->host)->crypt_stat;

	int rc = 0;
@@ -549,7 +550,7 @@ const struct address_space_operations ecryptfs_aops = { 
	.invalidate_folio = block_invalidate_folio,

#endif

	.writepage = ecryptfs_writepage,

	.readpage = ecryptfs_readpage,

	.read_folio = ecryptfs_read_folio,

	.write_begin = ecryptfs_write_begin,

	.write_end = ecryptfs_write_end,

	.bmap = ecryptfs_bmap,