Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shmem: convert shmem_get_link() to use a folio

Browse Source 
Symlinks will never use a large folio, but using the folio API removes a
lot of unnecessary folio->page->folio conversions.

Link: https://lkml.kernel.org/r/20220902194653.1739778-31-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2022-09-02 20:46:26 +01:00 committed by Andrew Morton
parent 7ad0414bde
commit e4b57722d0
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mm/shmem.c
View File

@ -3143,40 +3143,41 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir,
static void shmem_put_link(void *arg) static void shmem_put_link(void *arg)
{ {
mark_page_accessed(arg); folio_mark_accessed(arg);
put_page(arg); folio_put(arg);
} }
static const char *shmem_get_link(struct dentry *dentry, static const char *shmem_get_link(struct dentry *dentry,
struct inode *inode, struct inode *inode,
struct delayed_call *done) struct delayed_call *done)
{ {
struct page *page = NULL; struct folio *folio = NULL;
int error; int error;
if (!dentry) { if (!dentry) {
page = find_get_page(inode->i_mapping, 0); folio = filemap_get_folio(inode->i_mapping, 0);
if (!page) if (!folio)
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
if (PageHWPoison(page) || if (PageHWPoison(&folio->page) ||
!PageUptodate(page)) { !folio_test_uptodate(folio)) {
put_page(page); folio_put(folio);
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
} }
} else { } else {
error = shmem_getpage(inode, 0, &page, SGP_READ); error = shmem_get_folio(inode, 0, &folio, SGP_READ);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
if (!page) if (!folio)
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
if (PageHWPoison(page)) { if (PageHWPoison(&folio->page)) {
unlock_page(page); folio_unlock(folio);
put_page(page); folio_put(folio);
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
} }
unlock_page(page); folio_unlock(folio);
} }
set_delayed_call(done, shmem_put_link, page); set_delayed_call(done, shmem_put_link, folio);
return page_address(page); return folio_address(folio);
} }
#ifdef CONFIG_TMPFS_XATTR #ifdef CONFIG_TMPFS_XATTR