rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / fs / btrfs / disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 57106a99b52dd2b2bf60c715de89eab8e59ab619..1ac8db5dc0a31b9a742099956b121cd75ba0a1a6 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -801,8 +801,7 @@ static int btree_submit_bio_hook(struct inode *inode, int rw, struct bio *bio,
 
 #ifdef CONFIG_MIGRATION
 static int btree_migratepage(struct address_space *mapping,
-                       struct page *newpage, struct page *page,
-                       enum migrate_mode mode)
+                       struct page *newpage, struct page *page)
 {
        /*
         * we can't safely write a btree page from here,
@@ -817,7 +816,7 @@ static int btree_migratepage(struct address_space *mapping,
        if (page_has_private(page) &&
            !try_to_release_page(page, GFP_KERNEL))
                return -EAGAIN;
-       return migrate_page(mapping, newpage, page, mode);
+       return migrate_page(mapping, newpage, page);
 }
 #endif