Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

nfs: Use a folio in nfs_get_link()

Mirror the changes to __page_get_link() by retrieving a folio from
the page cache instead of a page. Removes two hidden calls to
compound_head().

Signed-off-by: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Link: https://lore.kernel.org/20250514171316.3002934-3-willy@infradead.org
Signed-off-by: Christian Brauner <brauner@kernel.org>

authored by

Matthew Wilcox (Oracle) and committed by
Christian Brauner
cc8e87f3 5f152cc0

+10 -10
+10 -10
fs/nfs/symlink.c
··· 40 40 struct inode *inode, 41 41 struct delayed_call *done) 42 42 { 43 - struct page *page; 43 + struct folio *folio; 44 44 void *err; 45 45 46 46 if (!dentry) { 47 47 err = ERR_PTR(nfs_revalidate_mapping_rcu(inode)); 48 48 if (err) 49 49 return err; 50 - page = find_get_page(inode->i_mapping, 0); 51 - if (!page) 50 + folio = filemap_get_folio(inode->i_mapping, 0); 51 + if (IS_ERR(folio)) 52 52 return ERR_PTR(-ECHILD); 53 - if (!PageUptodate(page)) { 54 - put_page(page); 53 + if (!folio_test_uptodate(folio)) { 54 + folio_put(folio); 55 55 return ERR_PTR(-ECHILD); 56 56 } 57 57 } else { 58 58 err = ERR_PTR(nfs_revalidate_mapping(inode, inode->i_mapping)); 59 59 if (err) 60 60 return err; 61 - page = read_cache_page(&inode->i_data, 0, nfs_symlink_filler, 61 + folio = read_cache_folio(&inode->i_data, 0, nfs_symlink_filler, 62 62 NULL); 63 - if (IS_ERR(page)) 64 - return ERR_CAST(page); 63 + if (IS_ERR(folio)) 64 + return ERR_CAST(folio); 65 65 } 66 - set_delayed_call(done, page_put_link, page); 67 - return page_address(page); 66 + set_delayed_call(done, page_put_link, &folio->page); 67 + return folio_address(folio); 68 68 } 69 69 70 70 /*