Merge branch 'for-6.0/dax' into libnvdimm-fixes

[people/ms/linux.git] / fs / coda / symlink.c

diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c
index 8adf810424986b1601e9ac1830d4a6a7dc49043e..ccdbec388091abb9c637027cd12aa4dcddf75164 100644 (file)
--- a/fs/coda/symlink.c
+++ b/fs/coda/symlink.c
@@ -22,25 +22,24 @@
 
 static int coda_symlink_filler(struct file *file, struct folio *folio)
 {
-       struct page *page = &folio->page;
        struct inode *inode = folio->mapping->host;
        int error;
        struct coda_inode_info *cii;
        unsigned int len = PAGE_SIZE;
-       char *p = page_address(page);
+       char *p = folio_address(folio);
 
        cii = ITOC(inode);
 
        error = venus_readlink(inode->i_sb, &cii->c_fid, p, &len);
        if (error)
                goto fail;
-       SetPageUptodate(page);
-       unlock_page(page);
+       folio_mark_uptodate(folio);
+       folio_unlock(folio);
        return 0;
 
 fail:
-       SetPageError(page);
-       unlock_page(page);
+       folio_set_error(folio);
+       folio_unlock(folio);
        return error;
 }