Merge branch 'kvm-older-features' into HEAD

[linux-2.6-microblaze.git] / fs / xfs / xfs_aops.c

diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index 9d6a67c..90b7f4d 100644 (file)
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -567,9 +567,9 @@ const struct address_space_operations xfs_address_space_operations = {
        .readpage               = xfs_vm_readpage,
        .readahead              = xfs_vm_readahead,
        .writepages             = xfs_vm_writepages,
-       .set_page_dirty         = __set_page_dirty_nobuffers,
+       .dirty_folio            = filemap_dirty_folio,
        .releasepage            = iomap_releasepage,
-       .invalidatepage         = iomap_invalidatepage,
+       .invalidate_folio       = iomap_invalidate_folio,
        .bmap                   = xfs_vm_bmap,
        .direct_IO              = noop_direct_IO,
        .migratepage            = iomap_migrate_page,
@@ -581,7 +581,6 @@ const struct address_space_operations xfs_address_space_operations = {
 const struct address_space_operations xfs_dax_aops = {
        .writepages             = xfs_dax_writepages,
        .direct_IO              = noop_direct_IO,
-       .set_page_dirty         = __set_page_dirty_no_writeback,
-       .invalidatepage         = noop_invalidatepage,
+       .dirty_folio            = noop_dirty_folio,
        .swap_activate          = xfs_iomap_swapfile_activate,
 };