From: Matthew Wilcox (Oracle) Date: Sun, 1 May 2022 23:39:03 +0000 (-0400) Subject: nfs: Pass the file pointer to nfs_symlink_filler() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6ece0a0452c97fe6cbdce1ff3069248d99f1b4aa;p=linux.git nfs: Pass the file pointer to nfs_symlink_filler() 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) Reviewed-by: Christoph Hellwig --- diff --git a/fs/nfs/symlink.c b/fs/nfs/symlink.c index 25ba299fdac2e..8b53538bcc75f 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); }