diff mbox series

[35/37] vboxsf: Convert vboxsf to read_folio

Message ID	20220508203131.667959-36-willy@infradead.org (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-fsdevel-owner@kernel.org> From: "Matthew Wilcox (Oracle)" <willy@infradead.org> To: linux-fsdevel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> Subject: [PATCH 35/37] vboxsf: Convert vboxsf to read_folio Date: Sun, 8 May 2022 21:31:29 +0100 Message-Id: <20220508203131.667959-36-willy@infradead.org> In-Reply-To: <20220508203131.667959-1-willy@infradead.org> References: <YngbFluT9ftR5dqf@casper.infradead.org> <20220508203131.667959-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Convert aops->read_page to aops->read_folio \| expand [00/37] Convert aops->read_page to aops->read_folio [01/37] fs: Introduce aops->read_folio [02/37] fs: Add read_folio documentation [03/37] fs: Convert netfs_readpage to netfs_read_folio [04/37] fs: Convert iomap_readpage to iomap_read_folio [05/37] fs: Convert block_read_full_page() to block_read_full_folio() [06/37] fs: Convert mpage_readpage to mpage_read_folio [07/37] fs: Convert simple_readpage to simple_read_folio [08/37] affs: Convert affs to read_folio [09/37] afs: Convert afs_symlink_readpage to afs_symlink_read_folio [10/37] befs: Convert befs to read_folio [11/37] btrfs: Convert btrfs to read_folio [12/37] cifs: Convert cifs to read_folio [13/37] coda: Convert coda to read_folio [14/37] cramfs: Convert cramfs to read_folio [15/37] ecryptfs: Convert ecryptfs to read_folio [16/37] efs: Convert efs symlinks to read_folio [17/37] erofs: Convert erofs zdata to read_folio [18/37] ext4: Convert ext4 to read_folio [19/37] f2fs: Convert f2fs to read_folio [20/37] freevxfs: Convert vxfs_immed to read_folio [21/37] fuse: Convert fuse to read_folio [22/37] hostfs: Convert hostfs to read_folio [23/37] hpfs: Convert symlinks to read_folio [24/37] isofs: Convert symlinks and zisofs to read_folio [25/37] jffs2: Convert jffs2 to read_folio [26/37] jfs: Convert metadata pages to read_folio [27/37] nfs: Convert nfs to read_folio [28/37] ntfs: Convert ntfs to read_folio [29/37] ocfs2: Convert ocfs2 to read_folio [30/37] orangefs: Convert orangefs to read_folio [31/37] romfs: Convert romfs to read_folio [32/37] squashfs: Convert squashfs to read_folio [33/37] ubifs: Convert ubifs to read_folio [34/37] udf: Convert adinicb and symlinks to read_folio [35/37] vboxsf: Convert vboxsf to read_folio [36/37] mm: Convert swap_readpage to call read_folio instead of readpage [37/37] mm,fs: Remove aops->readpage

Commit Message

Matthew Wilcox May 8, 2022, 8:31 p.m. UTC

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: Matthew Wilcox (Oracle) <willy@infradead.org>
---
 fs/vboxsf/file.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/fs/vboxsf/file.c b/fs/vboxsf/file.c
index d74e0d336995..572aa1c43b37 100644
--- a/fs/vboxsf/file.c
+++ b/fs/vboxsf/file.c
@@ -225,8 +225,9 @@  const struct inode_operations vboxsf_reg_iops = {
 	.setattr = vboxsf_setattr
 };
 
-static int vboxsf_readpage(struct file *file, struct page *page)
+static int vboxsf_read_folio(struct file *file, struct folio *folio)
 {
+	struct page *page = &folio->page;
 	struct vboxsf_handle *sf_handle = file->private_data;
 	loff_t off = page_offset(page);
 	u32 nread = PAGE_SIZE;
@@ -352,7 +353,7 @@  static int vboxsf_write_end(struct file *file, struct address_space *mapping,
  * page and it does not call SetPageUptodate for partial writes.
  */
 const struct address_space_operations vboxsf_reg_aops = {
-	.readpage = vboxsf_readpage,
+	.read_folio = vboxsf_read_folio,
 	.writepage = vboxsf_writepage,
 	.dirty_folio = filemap_dirty_folio,
 	.write_begin = simple_write_begin,