shmem: convert shmem_symlink() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Fri, 2 Sep 2022 19:46:25 +0000 (20:46 +0100)
committerAndrew Morton <akpm@linux-foundation.org>
Mon, 3 Oct 2022 21:02:49 +0000 (14:02 -0700)
While symlinks will always be < PAGE_SIZE, using the folio APIs gets rid
of unnecessary calls to compound_head().

Link: https://lkml.kernel.org/r/20220902194653.1739778-30-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/shmem.c

index c2016a7cfc296b2b4a14aef24fca718895e14c2f..4948ceffcc9fd0f9ed8e88abcbdf003e47e1d02a 100644 (file)
@@ -3093,7 +3093,7 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir,
        int error;
        int len;
        struct inode *inode;
-       struct page *page;
+       struct folio *folio;
 
        len = strlen(symname) + 1;
        if (len > PAGE_SIZE)
@@ -3121,18 +3121,18 @@ static int shmem_symlink(struct user_namespace *mnt_userns, struct inode *dir,
                inode->i_op = &shmem_short_symlink_operations;
        } else {
                inode_nohighmem(inode);
-               error = shmem_getpage(inode, 0, &page, SGP_WRITE);
+               error = shmem_get_folio(inode, 0, &folio, SGP_WRITE);
                if (error) {
                        iput(inode);
                        return error;
                }
                inode->i_mapping->a_ops = &shmem_aops;
                inode->i_op = &shmem_symlink_inode_operations;
-               memcpy(page_address(page), symname, len);
-               SetPageUptodate(page);
-               set_page_dirty(page);
-               unlock_page(page);
-               put_page(page);
+               memcpy(folio_address(folio), symname, len);
+               folio_mark_uptodate(folio);
+               folio_mark_dirty(folio);
+               folio_unlock(folio);
+               folio_put(folio);
        }
        dir->i_size += BOGO_DIRENT_SIZE;
        dir->i_ctime = dir->i_mtime = current_time(dir);