Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-21 19:41:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

jffs2: Convert jffs2_do_readpage_nolock to take a folio

Browse Source 
Both callers now have a folio, so pass it in.  No effort is made
here to support large folios.  Removes several hidden calls to
compound_head(), two references to page->index and a use of kmap.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Link: https://lore.kernel.org/r/20240814195915.249871-2-willy@infradead.org
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-08-14 20:59:12 +01:00 committed by Christian Brauner
parent 1da86618bd
commit bcc7d11e6c
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/jffs2/file.c
View File

@ -77,29 +77,27 @@ const struct address_space_operations jffs2_file_address_operations =
.write_end = jffs2_write_end, .write_end = jffs2_write_end,
}; };
static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) static int jffs2_do_readpage_nolock(struct inode *inode, struct folio *folio)
{ {
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb); struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
unsigned char *pg_buf; unsigned char *kaddr;
int ret; int ret;
jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n", jffs2_dbg(2, "%s(): ino #%lu, page at offset 0x%lx\n",
__func__, inode->i_ino, pg->index << PAGE_SHIFT); __func__, inode->i_ino, folio->index << PAGE_SHIFT);
BUG_ON(!PageLocked(pg)); BUG_ON(!folio_test_locked(folio));
pg_buf = kmap(pg); kaddr = kmap_local_folio(folio, 0);
/* FIXME: Can kmap fail? */ ret = jffs2_read_inode_range(c, f, kaddr, folio->index << PAGE_SHIFT,
ret = jffs2_read_inode_range(c, f, pg_buf, pg->index << PAGE_SHIFT,
PAGE_SIZE); PAGE_SIZE);
kunmap_local(kaddr);
if (!ret) if (!ret)
SetPageUptodate(pg); folio_mark_uptodate(folio);
flush_dcache_page(pg); flush_dcache_folio(folio);
kunmap(pg);
jffs2_dbg(2, "readpage finished\n"); jffs2_dbg(2, "readpage finished\n");
return ret; return ret;
@ -107,7 +105,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
int __jffs2_read_folio(struct file *file, struct folio *folio) int __jffs2_read_folio(struct file *file, struct folio *folio)
{ {
int ret = jffs2_do_readpage_nolock(folio->mapping->host, &folio->page); int ret = jffs2_do_readpage_nolock(folio->mapping->host, folio);
folio_unlock(folio); folio_unlock(folio);
return ret; return ret;
} }
@ -221,7 +219,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
*/ */
if (!folio_test_uptodate(folio)) { if (!folio_test_uptodate(folio)) {
mutex_lock(&f->sem); mutex_lock(&f->sem);
ret = jffs2_do_readpage_nolock(inode, &folio->page); ret = jffs2_do_readpage_nolock(inode, folio);
mutex_unlock(&f->sem); mutex_unlock(&f->sem);
if (ret) { if (ret) {
folio_unlock(folio); folio_unlock(folio);