iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jffs2: Convert jffs2 to read_folio

Browse Source 
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>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-04-29 11:12:16 -04:00
parent 551cb124b1
commit 75a47803b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/jffs2/file.c
View File

@ -27,7 +27,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
static int jffs2_write_begin(struct file *filp, struct address_space *mapping, static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); struct page **pagep, void **fsdata);
static int jffs2_readpage (struct file *filp, struct page *pg); static int jffs2_read_folio(struct file *filp, struct folio *folio);
int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync) int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
{ {
@ -72,7 +72,7 @@ const struct inode_operations jffs2_file_inode_operations =
const struct address_space_operations jffs2_file_address_operations = const struct address_space_operations jffs2_file_address_operations =
{ {
.readpage = jffs2_readpage, .read_folio = jffs2_read_folio,
.write_begin = jffs2_write_begin, .write_begin = jffs2_write_begin,
.write_end = jffs2_write_end, .write_end = jffs2_write_end,
}; };
@ -118,13 +118,13 @@ int jffs2_do_readpage_unlock(void *data, struct page *pg)
} }
static int jffs2_readpage (struct file *filp, struct page *pg) static int jffs2_read_folio(struct file *file, struct folio *folio)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host); struct jffs2_inode_info *f = JFFS2_INODE_INFO(folio->mapping->host);
int ret; int ret;
mutex_lock(&f->sem); mutex_lock(&f->sem);
ret = jffs2_do_readpage_unlock(pg->mapping->host, pg); ret = jffs2_do_readpage_unlock(folio->mapping->host, &folio->page);
mutex_unlock(&f->sem); mutex_unlock(&f->sem);
return ret; return ret;
} }

2
fs/jffs2/fs.c
View File

@ -178,7 +178,7 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
jffs2_complete_reservation(c); jffs2_complete_reservation(c);
/* We have to do the truncate_setsize() without f->sem held, since /* We have to do the truncate_setsize() without f->sem held, since
some pages may be locked and waiting for it in readpage(). some pages may be locked and waiting for it in read_folio().
We are protected from a simultaneous write() extending i_size We are protected from a simultaneous write() extending i_size
back past iattr->ia_size, because do_truncate() holds the back past iattr->ia_size, because do_truncate() holds the
generic inode semaphore. */ generic inode semaphore. */