1 files changed, 10 insertions, 4 deletions

diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
index 7e361da770b3..580412d330cb 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>
@@ -1277,18 +1278,18 @@ unm_done:
                 
                 tni = locked_nis[nr_locked_nis];
                 /* Get the base inode. */
-                down(&tni->extent_lock);
+                mutex_lock(&tni->extent_lock);
                 if (tni->nr_extents >= 0)
                         base_tni = tni;
                 else {
                         base_tni = tni->ext.base_ntfs_ino;
                         BUG_ON(!base_tni);
                 }
-                up(&tni->extent_lock);
+                mutex_unlock(&tni->extent_lock);
                 ntfs_debug("Unlocking %s inode 0x%lx.",
                                 tni == base_tni ? "base" : "extent",
                                 tni->mft_no);
-                up(&tni->mrec_lock);
+                mutex_unlock(&tni->mrec_lock);
                 atomic_dec(&tni->count);
                 iput(VFS_I(base_tni));
         }
@@ -1529,7 +1530,6 @@ err_out:
                                 "error %i.", err);
                 SetPageError(page);
                 NVolSetErrors(ni->vol);
-                make_bad_inode(vi);
         }
         unlock_page(page);
         if (ctx)
@@ -1551,6 +1551,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 +1570,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