Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / fs / ubifs / file.c

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 8cad0b19b404cc20be28835a6c99919fa2ef9aae..a02aa59d1e245124dcead693b15cd128fa2b1f4e 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1337,7 +1337,7 @@ int ubifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
                 */
                return 0;
 
-       err = filemap_write_and_wait_range(inode->i_mapping, start, end);
+       err = file_write_and_wait_range(file, start, end);
        if (err)
                return err;
        inode_lock(inode);
@@ -1490,7 +1490,10 @@ static int ubifs_migrate_page(struct address_space *mapping,
                SetPagePrivate(newpage);
        }
 
-       migrate_page_copy(newpage, page);
+       if (mode != MIGRATE_SYNC_NO_COPY)
+               migrate_page_copy(newpage, page);
+       else
+               migrate_page_states(newpage, page);
        return MIGRATEPAGE_SUCCESS;
 }
 #endif