Merge tag 'fuse-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[linux-2.6-microblaze.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index c178022..7a49bac 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1359,7 +1359,7 @@ static int __wait_on_page_locked_async(struct page *page,
        else
                ret = PageLocked(page);
        /*
-        * If we were succesful now, we know we're still on the
+        * If we were successful now, we know we're still on the
         * waitqueue as we're still under the lock. This means it's
         * safe to remove and return success, we know the callback
         * isn't going to trigger.
@@ -2981,14 +2981,14 @@ EXPORT_SYMBOL(filemap_map_pages);
 
 vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
 {
+       struct address_space *mapping = vmf->vma->vm_file->f_mapping;
        struct page *page = vmf->page;
-       struct inode *inode = file_inode(vmf->vma->vm_file);
        vm_fault_t ret = VM_FAULT_LOCKED;
 
-       sb_start_pagefault(inode->i_sb);
+       sb_start_pagefault(mapping->host->i_sb);
        file_update_time(vmf->vma->vm_file);
        lock_page(page);
-       if (page->mapping != inode->i_mapping) {
+       if (page->mapping != mapping) {
                unlock_page(page);
                ret = VM_FAULT_NOPAGE;
                goto out;
@@ -3001,7 +3001,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
        set_page_dirty(page);
        wait_for_stable_page(page);
 out:
-       sb_end_pagefault(inode->i_sb);
+       sb_end_pagefault(mapping->host->i_sb);
        return ret;
 }
 
@@ -3244,10 +3244,9 @@ void dio_warn_stale_pagecache(struct file *filp)
 {
        static DEFINE_RATELIMIT_STATE(_rs, 86400 * HZ, DEFAULT_RATELIMIT_BURST);
        char pathname[128];
-       struct inode *inode = file_inode(filp);
        char *path;
 
-       errseq_set(&inode->i_mapping->wb_err, -EIO);
+       errseq_set(&filp->f_mapping->wb_err, -EIO);
        if (__ratelimit(&_rs)) {
                path = file_path(filp, pathname, sizeof(pathname));
                if (IS_ERR(path))
@@ -3274,7 +3273,7 @@ generic_file_direct_write(struct kiocb *iocb, struct iov_iter *from)
 
        if (iocb->ki_flags & IOCB_NOWAIT) {
                /* If there are pages to writeback, return */
-               if (filemap_range_has_page(inode->i_mapping, pos,
+               if (filemap_range_has_page(file->f_mapping, pos,
                                           pos + write_len - 1))
                        return -EAGAIN;
        } else {