1 files changed, 11 insertions, 3 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7aacf31418fe..4bc8169fb5a1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -525,6 +525,7 @@ enum positive_aop_returns {
 struct page;
 struct address_space;
 struct writeback_control;
+enum migrate_mode;
 
 struct iov_iter {
         const struct iovec *iov;
@@ -609,9 +610,12 @@ struct address_space_operations {
                         loff_t offset, unsigned long nr_segs);
         int (*get_xip_mem)(struct address_space *, pgoff_t, int,
                                                 void **, unsigned long *);
-        /* migrate the contents of a page to the specified target */
+        /*
+         * migrate the contents of a page to the specified target. If sync
+         * is false, it must not block.
+         */
         int (*migratepage) (struct address_space *,
-                        struct page *, struct page *);
+                        struct page *, struct page *, enum migrate_mode);
         int (*launder_page) (struct page *);
         int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
                                         unsigned long);
@@ -656,6 +660,7 @@ struct address_space {
          * must be enforced here for CRIS, to let the least significant bit
          * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.
          */
+struct request_queue;
 
 struct block_device {
         dev_t                   bd_dev;  /* not a kdev_t - it's a search key */
@@ -678,6 +683,7 @@ struct block_device {
         unsigned                bd_part_count;
         int                     bd_invalidated;
         struct gendisk *        bd_disk;
+        struct request_queue *  bd_queue;
         struct list_head        bd_list;
         /*
          * Private data.  You must have bd_claim'ed the block_device
@@ -1001,6 +1007,7 @@ struct file {
 #ifdef CONFIG_EPOLL
         /* Used by fs/eventpoll.c to link all the hooks to this file */
         struct list_head        f_ep_links;
+        struct list_head        f_tfile_llink;
 #endif /* #ifdef CONFIG_EPOLL */
         struct address_space    *f_mapping;
 #ifdef CONFIG_DEBUG_WRITECOUNT
@@ -2536,7 +2543,8 @@ extern int generic_check_addressable(unsigned, u64);
 
 #ifdef CONFIG_MIGRATION
 extern int buffer_migrate_page(struct address_space *,
-                                struct page *, struct page *);
+                                struct page *, struct page *,
+                                enum migrate_mode);
 #else
 #define buffer_migrate_page NULL
 #endif