From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox (Oracle) Date: Mon, 2 May 2022 06:41:58 +0100 Subject: [Cluster-devel] [PATCH 2/3] nfs: Pass the file pointer to nfs_symlink_filler() In-Reply-To: <20220502054159.3471078-1-willy@infradead.org> References: <20220502054159.3471078-1-willy@infradead.org> Message-ID: <20220502054159.3471078-3-willy@infradead.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit In preparation for unifying the read_cache_page() and read_folio() implementations, make nfs_symlink_filler() get the inode from the page instead of passing it in from read_cache_page(). Signed-off-by: Matthew Wilcox (Oracle) --- fs/nfs/symlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 25ba299fdac2..8b53538bcc75 100644 --- a/fs/nfs/symlink.c +++ b/fs/nfs/symlink.c @@ -28,7 +28,7 @@ static int nfs_symlink_filler(void *data, struct page *page) { - struct inode *inode = data; + struct inode *inode = page->mapping->host; int error; error = NFS_PROTO(inode)->readlink(inode, page, 0, PAGE_SIZE); @@ -67,7 +67,7 @@ static const char *nfs_get_link(struct dentry *dentry, if (err) return err; page = read_cache_page(&inode->i_data, 0, nfs_symlink_filler, - inode); + NULL); if (IS_ERR(page)) return ERR_CAST(page); } -- 2.34.1