Merge tag 'soc-ep93xx-dt-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-block.git] / fs / ocfs2 / file.c

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index ccc57038a9779f7105667c08138d4b3b170ef1db..ad131a2fc58e4014c57629932b8b8bc772660abb 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -755,7 +755,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                                 u64 abs_to, struct buffer_head *di_bh)
 {
        struct address_space *mapping = inode->i_mapping;
-       struct page *page;
+       struct folio *folio;
        unsigned long index = abs_from >> PAGE_SHIFT;
        handle_t *handle;
        int ret = 0;
@@ -774,9 +774,10 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                goto out;
        }
 
-       page = find_or_create_page(mapping, index, GFP_NOFS);
-       if (!page) {
-               ret = -ENOMEM;
+       folio = __filemap_get_folio(mapping, index,
+                       FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);
+       if (IS_ERR(folio)) {
+               ret = PTR_ERR(folio);
                mlog_errno(ret);
                goto out_commit_trans;
        }
@@ -803,7 +804,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                 * __block_write_begin and block_commit_write to zero the
                 * whole block.
                 */
-               ret = __block_write_begin(page, block_start + 1, 0,
+               ret = __block_write_begin(folio, block_start + 1, 0,
                                          ocfs2_get_block);
                if (ret < 0) {
                        mlog_errno(ret);
@@ -812,7 +813,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
 
 
                /* must not update i_size! */
-               block_commit_write(page, block_start + 1, block_start + 1);
+               block_commit_write(&folio->page, block_start + 1, block_start + 1);
        }
 
        /*
@@ -833,8 +834,8 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
        }
 
 out_unlock:
-       unlock_page(page);
-       put_page(page);
+       folio_unlock(folio);
+       folio_put(folio);
 out_commit_trans:
        if (handle)
                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);
@@ -2750,6 +2751,13 @@ out_unlock:
        return remapped > 0 ? remapped : ret;
 }
 
+static loff_t ocfs2_dir_llseek(struct file *file, loff_t offset, int whence)
+{
+       struct ocfs2_file_private *fp = file->private_data;
+
+       return generic_llseek_cookie(file, offset, whence, &fp->cookie);
+}
+
 const struct inode_operations ocfs2_file_iops = {
        .setattr        = ocfs2_setattr,
        .getattr        = ocfs2_getattr,
@@ -2797,7 +2805,7 @@ const struct file_operations ocfs2_fops = {
 
 WRAP_DIR_ITER(ocfs2_readdir) // FIXME!
 const struct file_operations ocfs2_dops = {
-       .llseek         = generic_file_llseek,
+       .llseek         = ocfs2_dir_llseek,
        .read           = generic_read_dir,
        .iterate_shared = shared_ocfs2_readdir,
        .fsync          = ocfs2_sync_file,
@@ -2843,7 +2851,7 @@ const struct file_operations ocfs2_fops_no_plocks = {
 };
 
 const struct file_operations ocfs2_dops_no_plocks = {
-       .llseek         = generic_file_llseek,
+       .llseek         = ocfs2_dir_llseek,
        .read           = generic_read_dir,
        .iterate_shared = shared_ocfs2_readdir,
        .fsync          = ocfs2_sync_file,