]> Git Repo - linux.git/commitdiff
romfs: Convert romfs to read_folio
authorMatthew Wilcox (Oracle) <[email protected]>
Fri, 29 Apr 2022 15:12:16 +0000 (11:12 -0400)
committerMatthew Wilcox (Oracle) <[email protected]>
Mon, 9 May 2022 20:21:46 +0000 (16:21 -0400)
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) <[email protected]>
fs/romfs/super.c

index 9e6bbb4219de8594c279f1558be6290bedc84f71..c59b230d55b435482f202b3457fe7dc6b4035081 100644 (file)
@@ -18,7 +18,7 @@
  *                                     Changed for 2.1.19 modules
  *     Jan 1997                        Initial release
  *     Jun 1997                        2.1.43+ changes
- *                                     Proper page locking in readpage
+ *                                     Proper page locking in read_folio
  *                                     Changed to work with 2.1.45+ fs
  *     Jul 1997                        Fixed follow_link
  *                     2.1.47
@@ -41,7 +41,7 @@
  *                                       dentries in lookup
  *                                     clean up page flags setting
  *                                       (error, uptodate, locking) in
- *                                       in readpage
+ *                                       in read_folio
  *                                     use init_special_inode for
  *                                       fifos/sockets (and streamline) in
  *                                       read_inode, fix _ops table order
@@ -99,8 +99,9 @@ static struct inode *romfs_iget(struct super_block *sb, unsigned long pos);
 /*
  * read a page worth of data from the image
  */
-static int romfs_readpage(struct file *file, struct page *page)
+static int romfs_read_folio(struct file *file, struct folio *folio)
 {
+       struct page *page = &folio->page;
        struct inode *inode = page->mapping->host;
        loff_t offset, size;
        unsigned long fillsize, pos;
@@ -142,7 +143,7 @@ static int romfs_readpage(struct file *file, struct page *page)
 }
 
 static const struct address_space_operations romfs_aops = {
-       .readpage       = romfs_readpage
+       .read_folio     = romfs_read_folio
 };
 
 /*
This page took 0.047567 seconds and 4 git commands to generate.