Merge tag 'uml-for-linus-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / fs / affs / file.c

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 472e2bd..04c018e 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -523,21 +523,20 @@ affs_getemptyblk_ino(struct inode *inode, int block)
        return ERR_PTR(err);
 }
 
-static int
-affs_do_readpage_ofs(struct page *page, unsigned to, int create)
+static int affs_do_read_folio_ofs(struct folio *folio, size_t to, int create)
 {
-       struct inode *inode = page->mapping->host;
+       struct inode *inode = folio->mapping->host;
        struct super_block *sb = inode->i_sb;
        struct buffer_head *bh;
-       unsigned pos = 0;
-       u32 bidx, boff, bsize;
+       size_t pos = 0;
+       size_t bidx, boff, bsize;
        u32 tmp;
 
-       pr_debug("%s(%lu, %ld, 0, %d)\n", __func__, inode->i_ino,
-                page->index, to);
-       BUG_ON(to > PAGE_SIZE);
+       pr_debug("%s(%lu, %ld, 0, %zu)\n", __func__, inode->i_ino,
+                folio->index, to);
+       BUG_ON(to > folio_size(folio));
        bsize = AFFS_SB(sb)->s_data_blksize;
-       tmp = page->index << PAGE_SHIFT;
+       tmp = folio_pos(folio);
        bidx = tmp / bsize;
        boff = tmp % bsize;
 
@@ -547,7 +546,7 @@ affs_do_readpage_ofs(struct page *page, unsigned to, int create)
                        return PTR_ERR(bh);
                tmp = min(bsize - boff, to - pos);
                BUG_ON(pos + tmp > to || tmp > bsize);
-               memcpy_to_page(page, pos, AFFS_DATA(bh) + boff, tmp);
+               memcpy_to_folio(folio, pos, AFFS_DATA(bh) + boff, tmp);
                affs_brelse(bh);
                bidx++;
                pos += tmp;
@@ -627,25 +626,23 @@ out:
        return PTR_ERR(bh);
 }
 
-static int
-affs_read_folio_ofs(struct file *file, struct folio *folio)
+static int affs_read_folio_ofs(struct file *file, struct folio *folio)
 {
-       struct page *page = &folio->page;
-       struct inode *inode = page->mapping->host;
-       u32 to;
+       struct inode *inode = folio->mapping->host;
+       size_t to;
        int err;
 
-       pr_debug("%s(%lu, %ld)\n", __func__, inode->i_ino, page->index);
-       to = PAGE_SIZE;
-       if (((page->index + 1) << PAGE_SHIFT) > inode->i_size) {
-               to = inode->i_size & ~PAGE_MASK;
-               memset(page_address(page) + to, 0, PAGE_SIZE - to);
+       pr_debug("%s(%lu, %ld)\n", __func__, inode->i_ino, folio->index);
+       to = folio_size(folio);
+       if (folio_pos(folio) + to > inode->i_size) {
+               to = inode->i_size - folio_pos(folio);
+               folio_zero_segment(folio, to, folio_size(folio));
        }
 
-       err = affs_do_readpage_ofs(page, to, 0);
+       err = affs_do_read_folio_ofs(folio, to, 0);
        if (!err)
-               SetPageUptodate(page);
-       unlock_page(page);
+               folio_mark_uptodate(folio);
+       folio_unlock(folio);
        return err;
 }
 
@@ -654,7 +651,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
                                struct page **pagep, void **fsdata)
 {
        struct inode *inode = mapping->host;
-       struct page *page;
+       struct folio *folio;
        pgoff_t index;
        int err = 0;
 
@@ -670,19 +667,20 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
        }
 
        index = pos >> PAGE_SHIFT;
-       page = grab_cache_page_write_begin(mapping, index);
-       if (!page)
-               return -ENOMEM;
-       *pagep = page;
+       folio = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,
+                       mapping_gfp_mask(mapping));
+       if (IS_ERR(folio))
+               return PTR_ERR(folio);
+       *pagep = &folio->page;
 
-       if (PageUptodate(page))
+       if (folio_test_uptodate(folio))
                return 0;
 
        /* XXX: inefficient but safe in the face of short writes */
-       err = affs_do_readpage_ofs(page, PAGE_SIZE, 1);
+       err = affs_do_read_folio_ofs(folio, folio_size(folio), 1);
        if (err) {
-               unlock_page(page);
-               put_page(page);
+               folio_unlock(folio);
+               folio_put(folio);
        }
        return err;
 }
@@ -691,6 +689,7 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
                                loff_t pos, unsigned len, unsigned copied,
                                struct page *page, void *fsdata)
 {
+       struct folio *folio = page_folio(page);
        struct inode *inode = mapping->host;
        struct super_block *sb = inode->i_sb;
        struct buffer_head *bh, *prev_bh;
@@ -704,18 +703,18 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
        to = from + len;
        /*
         * XXX: not sure if this can handle short copies (len < copied), but
-        * we don't have to, because the page should always be uptodate here,
+        * we don't have to, because the folio should always be uptodate here,
         * due to write_begin.
         */
 
        pr_debug("%s(%lu, %llu, %llu)\n", __func__, inode->i_ino, pos,
                 pos + len);
        bsize = AFFS_SB(sb)->s_data_blksize;
-       data = page_address(page);
+       data = folio_address(folio);
 
        bh = NULL;
        written = 0;
-       tmp = (page->index << PAGE_SHIFT) + from;
+       tmp = (folio->index << PAGE_SHIFT) + from;
        bidx = tmp / bsize;
        boff = tmp % bsize;
        if (boff) {
@@ -807,11 +806,11 @@ static int affs_write_end_ofs(struct file *file, struct address_space *mapping,
                from += tmp;
                bidx++;
        }
-       SetPageUptodate(page);
+       folio_mark_uptodate(folio);
 
 done:
        affs_brelse(bh);
-       tmp = (page->index << PAGE_SHIFT) + from;
+       tmp = (folio->index << PAGE_SHIFT) + from;
        if (tmp > inode->i_size)
                inode->i_size = AFFS_I(inode)->mmu_private = tmp;
 
@@ -822,8 +821,8 @@ done:
        }
 
 err_first_bh:
-       unlock_page(page);
-       put_page(page);
+       folio_unlock(folio);
+       folio_put(folio);
 
        return written;