1 files changed, 2 insertions, 3 deletions

diff --git a/mm/filemap.c b/mm/filemap.c
index 673e4581a2e5..d9f5336552d7 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -211,7 +211,7 @@ void __delete_from_page_cache(struct page *page, void *shadow)
          */
         if (PageDirty(page) && mapping_cap_account_dirty(mapping)) {
                 dec_zone_page_state(page, NR_FILE_DIRTY);
-                dec_bdi_stat(mapping->backing_dev_info, BDI_RECLAIMABLE);
+                dec_bdi_stat(inode_to_bdi(mapping->host), BDI_RECLAIMABLE);
         }
 }
 
@@ -2087,7 +2087,6 @@ const struct vm_operations_struct generic_file_vm_ops = {
         .fault          = filemap_fault,
         .map_pages      = filemap_map_pages,
         .page_mkwrite   = filemap_page_mkwrite,
-        .remap_pages    = generic_file_remap_pages,
 };
 
 /* This is used for a general mmap of a disk file */
@@ -2565,7 +2564,7 @@ ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         size_t          count = iov_iter_count(from);
 
         /* We can write back this queue in page reclaim */
-        current->backing_dev_info = mapping->backing_dev_info;
+        current->backing_dev_info = inode_to_bdi(inode);
         err = generic_write_checks(file, &pos, &count, S_ISBLK(inode->i_mode));
         if (err)
                 goto out;