diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-02 01:39:03 +0200 |
|---|---|---|
| committer | Matthew Wilcox (Oracle) <willy@infradead.org> | 2022-05-09 22:28:41 +0200 |
| commit | 2294f9b8793d02b265423207e55ce5b26d8960cd (patch) | |
| tree | a74a8a0badfc2c93384ef8a597b68ad974425e53 /fs | |
| parent | mm,fs: Remove aops->readpage (diff) | |
| download | linux-2294f9b8793d02b265423207e55ce5b26d8960cd.tar.xz linux-2294f9b8793d02b265423207e55ce5b26d8960cd.zip | |
jffs2: Pass the file pointer to jffs2_do_readpage_unlock()
In preparation for unifying the read_cache_page() and read_folio()
implementations, make jffs2_do_readpage_unlock() get the inode
from the page instead of passing it in from read_cache_page().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/file.c | 4 | ||||
| -rw-r--r-- | fs/jffs2/gc.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index f8616683fbee..492fb2da0403 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -112,7 +112,7 @@ static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg) int jffs2_do_readpage_unlock(void *data, struct page *pg) { - int ret = jffs2_do_readpage_nolock(data, pg); + int ret = jffs2_do_readpage_nolock(pg->mapping->host, pg); unlock_page(pg); return ret; } @@ -124,7 +124,7 @@ static int jffs2_read_folio(struct file *file, struct folio *folio) int ret; mutex_lock(&f->sem); - ret = jffs2_do_readpage_unlock(folio->mapping->host, &folio->page); + ret = jffs2_do_readpage_unlock(file, &folio->page); mutex_unlock(&f->sem); return ret; } diff --git a/fs/jffs2/gc.c b/fs/jffs2/gc.c index 373b3b7c9f44..a53bac7569b6 100644 --- a/fs/jffs2/gc.c +++ b/fs/jffs2/gc.c @@ -1327,7 +1327,7 @@ static int jffs2_garbage_collect_dnode(struct jffs2_sb_info *c, struct jffs2_era * trying to write out, read_cache_page() will not deadlock. */ mutex_unlock(&f->sem); page = read_cache_page(inode->i_mapping, start >> PAGE_SHIFT, - jffs2_do_readpage_unlock, inode); + jffs2_do_readpage_unlock, NULL); if (IS_ERR(page)) { pr_warn("read_cache_page() returned error: %ld\n", PTR_ERR(page)); |