]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
f2fs: Convert f2fs_write_end() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Wed, 10 Jul 2024 20:42:35 +0000 (16:42 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 7 Aug 2024 09:32:00 +0000 (11:32 +0200)
Convert the passed page to a folio and operate on that.
Replaces five calls to compound_head() with one.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
fs/f2fs/data.c

index 6457e5bca9c9e77442e88dcb5b797d76128f93bb..58ac23e124a5890bb9fb459bb3113e70e70ea3f8 100644 (file)
@@ -3687,7 +3687,8 @@ static int f2fs_write_end(struct file *file,
                        loff_t pos, unsigned len, unsigned copied,
                        struct page *page, void *fsdata)
 {
-       struct inode *inode = page->mapping->host;
+       struct folio *folio = page_folio(page);
+       struct inode *inode = folio->mapping->host;
 
        trace_f2fs_write_end(inode, pos, len, copied);
 
@@ -3696,17 +3697,17 @@ static int f2fs_write_end(struct file *file,
         * should be PAGE_SIZE. Otherwise, we treat it with zero copied and
         * let generic_perform_write() try to copy data again through copied=0.
         */
-       if (!PageUptodate(page)) {
+       if (!folio_test_uptodate(folio)) {
                if (unlikely(copied != len))
                        copied = 0;
                else
-                       SetPageUptodate(page);
+                       folio_mark_uptodate(folio);
        }
 
 #ifdef CONFIG_F2FS_FS_COMPRESSION
        /* overwrite compressed file */
        if (f2fs_compressed_file(inode) && fsdata) {
-               f2fs_compress_write_end(inode, fsdata, page->index, copied);
+               f2fs_compress_write_end(inode, fsdata, folio->index, copied);
                f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
 
                if (pos + copied > i_size_read(inode) &&
@@ -3719,7 +3720,7 @@ static int f2fs_write_end(struct file *file,
        if (!copied)
                goto unlock_out;
 
-       set_page_dirty(page);
+       folio_mark_dirty(folio);
 
        if (pos + copied > i_size_read(inode) &&
            !f2fs_verity_in_progress(inode)) {
@@ -3729,7 +3730,8 @@ static int f2fs_write_end(struct file *file,
                                        pos + copied);
        }
 unlock_out:
-       f2fs_put_page(page, 1);
+       folio_unlock(folio);
+       folio_put(folio);
        f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
        return copied;
 }