ntfs3: Convert ntfs_write_end() to work on a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 22 Apr 2024 19:31:54 +0000 (20:31 +0100)
committerKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Wed, 26 Jun 2024 12:48:55 +0000 (15:48 +0300)
Convert the passed page back into a folio and use the folio APIs, saving
a few hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
fs/ntfs3/inode.c

index fd544e710ed1d6caa2a3915a45342cbe564e87ca..e51454ae4dc3590dc78ee041bc0dde54373b6b63 100644 (file)
@@ -950,6 +950,7 @@ out:
 int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
                   u32 len, u32 copied, struct page *page, void *fsdata)
 {
+       struct folio *folio = page_folio(page);
        struct inode *inode = mapping->host;
        struct ntfs_inode *ni = ntfs_i(inode);
        u64 valid = ni->i_valid;
@@ -961,23 +962,23 @@ int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
                err = attr_data_write_resident(ni, page);
                ni_unlock(ni);
                if (!err) {
+                       struct buffer_head *head = folio_buffers(folio);
                        dirty = true;
-                       /* Clear any buffers in page. */
-                       if (page_has_buffers(page)) {
-                               struct buffer_head *head, *bh;
+                       /* Clear any buffers in folio. */
+                       if (head) {
+                               struct buffer_head *bh = head;
 
-                               bh = head = page_buffers(page);
                                do {
                                        clear_buffer_dirty(bh);
                                        clear_buffer_mapped(bh);
                                        set_buffer_uptodate(bh);
                                } while (head != (bh = bh->b_this_page));
                        }
-                       SetPageUptodate(page);
+                       folio_mark_uptodate(folio);
                        err = copied;
                }
-               unlock_page(page);
-               put_page(page);
+               folio_unlock(folio);
+               folio_put(folio);
        } else {
                err = generic_write_end(file, mapping, pos, len, copied, page,
                                        fsdata);