Merge tag 'mm-stable-2023-04-27-15-30' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / fs / ext4 / move_extent.c

diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 7bf6d069199cbb7870220755e590e54b1fa93bad..b5af2fc03b2f1be657c96a1037789ce147b4d12b 100644 (file)
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -126,7 +126,6 @@ mext_folio_double_lock(struct inode *inode1, struct inode *inode2,
 {
        struct address_space *mapping[2];
        unsigned int flags;
-       unsigned fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
 
        BUG_ON(!inode1 || !inode2);
        if (inode1 < inode2) {
@@ -139,14 +138,14 @@ mext_folio_double_lock(struct inode *inode1, struct inode *inode2,
        }
 
        flags = memalloc_nofs_save();
-       folio[0] = __filemap_get_folio(mapping[0], index1, fgp_flags,
+       folio[0] = __filemap_get_folio(mapping[0], index1, FGP_WRITEBEGIN,
                        mapping_gfp_mask(mapping[0]));
        if (IS_ERR(folio[0])) {
                memalloc_nofs_restore(flags);
                return PTR_ERR(folio[0]);
        }
 
-       folio[1] = __filemap_get_folio(mapping[1], index2, fgp_flags,
+       folio[1] = __filemap_get_folio(mapping[1], index2, FGP_WRITEBEGIN,
                        mapping_gfp_mask(mapping[1]));
        memalloc_nofs_restore(flags);
        if (IS_ERR(folio[1])) {
@@ -169,25 +168,27 @@ mext_folio_double_lock(struct inode *inode1, struct inode *inode2,
 
 /* Force page buffers uptodate w/o dropping page's lock */
 static int
-mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
+mext_page_mkuptodate(struct folio *folio, unsigned from, unsigned to)
 {
-       struct inode *inode = page->mapping->host;
+       struct inode *inode = folio->mapping->host;
        sector_t block;
        struct buffer_head *bh, *head, *arr[MAX_BUF_PER_PAGE];
        unsigned int blocksize, block_start, block_end;
        int i, err,  nr = 0, partial = 0;
-       BUG_ON(!PageLocked(page));
-       BUG_ON(PageWriteback(page));
+       BUG_ON(!folio_test_locked(folio));
+       BUG_ON(folio_test_writeback(folio));
 
-       if (PageUptodate(page))
+       if (folio_test_uptodate(folio))
                return 0;
 
        blocksize = i_blocksize(inode);
-       if (!page_has_buffers(page))
-               create_empty_buffers(page, blocksize, 0);
+       head = folio_buffers(folio);
+       if (!head) {
+               create_empty_buffers(&folio->page, blocksize, 0);
+               head = folio_buffers(folio);
+       }
 
-       head = page_buffers(page);
-       block = (sector_t)page->index << (PAGE_SHIFT - inode->i_blkbits);
+       block = (sector_t)folio->index << (PAGE_SHIFT - inode->i_blkbits);
        for (bh = head, block_start = 0; bh != head || !block_start;
             block++, block_start = block_end, bh = bh->b_this_page) {
                block_end = block_start + blocksize;
@@ -201,11 +202,11 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
                if (!buffer_mapped(bh)) {
                        err = ext4_get_block(inode, block, bh, 0);
                        if (err) {
-                               SetPageError(page);
+                               folio_set_error(folio);
                                return err;
                        }
                        if (!buffer_mapped(bh)) {
-                               zero_user(page, block_start, blocksize);
+                               folio_zero_range(folio, block_start, blocksize);
                                set_buffer_uptodate(bh);
                                continue;
                        }
@@ -227,7 +228,7 @@ mext_page_mkuptodate(struct page *page, unsigned from, unsigned to)
        }
 out:
        if (!partial)
-               SetPageUptodate(page);
+               folio_mark_uptodate(folio);
        return 0;
 }
 
@@ -355,7 +356,7 @@ again:
                goto unlock_folios;
        }
 data_copy:
-       *err = mext_page_mkuptodate(&folio[0]->page, from, from + replaced_size);
+       *err = mext_page_mkuptodate(folio[0], from, from + replaced_size);
        if (*err)
                goto unlock_folios;