Commit 42d7a524 authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle)
Browse files

freevxfs: Convert vxfs_immed 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 be05584f

fs/freevxfs/vxfs_immed.c

+8 −7
Original line number Diff line number Diff line
@@ -38,33 +38,34 @@ 
#include "vxfs_inode.h"





static int	vxfs_immed_readpage(struct file *, struct page *);

static int	vxfs_immed_read_folio(struct file *, struct folio *);



/*

 * Address space operations for immed files and directories.

 */

const struct address_space_operations vxfs_immed_aops = {

	.readpage =		vxfs_immed_readpage,

	.read_folio =		vxfs_immed_read_folio,

};



/**

 * vxfs_immed_readpage - read part of an immed inode into pagecache

 * vxfs_immed_read_folio - read part of an immed inode into pagecache

 * @file:	file context (unused)

 * @page:	page frame to fill in.

 * @folio:	folio to fill in.

 *

 * Description:

 *   vxfs_immed_readpage reads a part of the immed area of the

 *   vxfs_immed_read_folio reads a part of the immed area of the

 *   file that hosts @pp into the pagecache.

 *

 * Returns:

 *   Zero on success, else a negative error code.

 *

 * Locking status:

 *   @page is locked and will be unlocked.

 *   @folio is locked and will be unlocked.

 */

static int

vxfs_immed_readpage(struct file *fp, struct page *pp)

vxfs_immed_read_folio(struct file *fp, struct folio *folio)

{

	struct page *pp = &folio->page;

	struct vxfs_inode_info	*vip = VXFS_INO(pp->mapping->host);

	u_int64_t	offset = (u_int64_t)pp->index << PAGE_SHIFT;

	caddr_t		kaddr;