]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
orangefs: Convert orangefs_write_begin() to use a folio
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 11 Jul 2024 20:58:06 +0000 (16:58 -0400)
committerChristian Brauner <brauner@kernel.org>
Wed, 7 Aug 2024 09:32:02 +0000 (11:32 +0200)
Retrieve a folio from the page cache instead of a page.  This
function was previously mostly converted to use a folio, so it's
a fairly small change.

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/orangefs/inode.c

index 6595417f62b189be46e97b3e52fdcc5b6b431149..e8440fa7d73ce31e7faba36b7f1101d8618deecc 100644 (file)
@@ -313,18 +313,14 @@ static int orangefs_write_begin(struct file *file,
 {
        struct orangefs_write_range *wr;
        struct folio *folio;
-       struct page *page;
-       pgoff_t index;
        int ret;
 
-       index = pos >> PAGE_SHIFT;
+       folio = __filemap_get_folio(mapping, pos / PAGE_SIZE, FGP_WRITEBEGIN,
+                       mapping_gfp_mask(mapping));
+       if (IS_ERR(folio))
+               return PTR_ERR(folio);
 
-       page = grab_cache_page_write_begin(mapping, index);
-       if (!page)
-               return -ENOMEM;
-
-       *pagep = page;
-       folio = page_folio(page);
+       *pagep = &folio->page;
 
        if (folio_test_dirty(folio) && !folio_test_private(folio)) {
                /*