udf: Convert udf_expand_file_adinicb() to use a folio

[linux-2.6-block.git] / fs / udf / inode.c

diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 5146b9d7aba36732e9474e3792fd5a484d9b3cf7..59215494e6f6f468e274ee23e83e425ede966ccb 100644 (file)
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -342,7 +342,7 @@ const struct address_space_operations udf_aops = {
  */
 int udf_expand_file_adinicb(struct inode *inode)
 {
-       struct page *page;
+       struct folio *folio;
        struct udf_inode_info *iinfo = UDF_I(inode);
        int err;
 
@@ -358,12 +358,13 @@ int udf_expand_file_adinicb(struct inode *inode)
                return 0;
        }
 
-       page = find_or_create_page(inode->i_mapping, 0, GFP_KERNEL);
-       if (!page)
-               return -ENOMEM;
+       folio = __filemap_get_folio(inode->i_mapping, 0,
+                       FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_KERNEL);
+       if (IS_ERR(folio))
+               return PTR_ERR(folio);
 
-       if (!PageUptodate(page))
-               udf_adinicb_readpage(page);
+       if (!folio_test_uptodate(folio))
+               udf_adinicb_readpage(&folio->page);
        down_write(&iinfo->i_data_sem);
        memset(iinfo->i_data + iinfo->i_lenEAttr, 0x00,
               iinfo->i_lenAlloc);
@@ -372,22 +373,22 @@ int udf_expand_file_adinicb(struct inode *inode)
                iinfo->i_alloc_type = ICBTAG_FLAG_AD_SHORT;
        else
                iinfo->i_alloc_type = ICBTAG_FLAG_AD_LONG;
-       set_page_dirty(page);
-       unlock_page(page);
+       folio_mark_dirty(folio);
+       folio_unlock(folio);
        up_write(&iinfo->i_data_sem);
        err = filemap_fdatawrite(inode->i_mapping);
        if (err) {
                /* Restore everything back so that we don't lose data... */
-               lock_page(page);
+               folio_lock(folio);
                down_write(&iinfo->i_data_sem);
-               memcpy_to_page(page, 0, iinfo->i_data + iinfo->i_lenEAttr,
-                              inode->i_size);
-               unlock_page(page);
+               memcpy_from_folio(iinfo->i_data + iinfo->i_lenEAttr,
+                               folio, 0, inode->i_size);
+               folio_unlock(folio);
                iinfo->i_alloc_type = ICBTAG_FLAG_AD_IN_ICB;
                iinfo->i_lenAlloc = inode->i_size;
                up_write(&iinfo->i_data_sem);
        }
-       put_page(page);
+       folio_put(folio);
        mark_inode_dirty(inode);
 
        return err;