2 files changed, 10 insertions, 1 deletions

diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index d35a5c8e3da9..8df10700a930 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -19,13 +19,15 @@ ToDo/Notes:
         - Enable the code for setting the NT4 compatibility flag when we start
           making NTFS 1.2 specific modifications.
 
-2.1.27 - Various bug fixes.
+2.1.27 - Various bug fixes and cleanups.
 
         - Fix two compiler warnings on Alpha.  Thanks to Andrew Morton for
           reporting them.
         - Fix an (innocent) off-by-one error in the runlist code.
         - Fix a buggette in an "should be impossible" case handling where we
           continued the attribute lookup loop instead of aborting it.
+        - Use buffer_migrate_page() for the ->migratepage function of all ntfs
+          address space operations.
 
 2.1.26 - Minor bug fixes and updates.
 
diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 7e361da770b3..7c7e313620fa 100644
--- a/fs/ntfs/aops.c
+++ b/fs/ntfs/aops.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
@@ -1551,6 +1552,9 @@ struct address_space_operations ntfs_aops = {
 #ifdef NTFS_RW
         .writepage      = ntfs_writepage,       /* Write dirty page to disk. */
 #endif /* NTFS_RW */
+        .migratepage    = buffer_migrate_page,  /* Move a page cache page from
+                                                   one physical page to an
+                                                   other. */
 };
 
 /**
@@ -1567,6 +1571,9 @@ struct address_space_operations ntfs_mst_aops = {
                                                    without touching the buffers
                                                    belonging to the page. */
 #endif /* NTFS_RW */
+        .migratepage    = buffer_migrate_page,  /* Move a page cache page from
+                                                   one physical page to an
+                                                   other. */
 };
 
 #ifdef NTFS_RW