Merge branch 'xarray' of git://git.infradead.org/users/willy/linux-dax

[linux-2.6-block.git] / include / linux / swap.h

diff --git a/include/linux/swap.h b/include/linux/swap.h
index cb479bf5842e2c05d2f86d7f669c9e9154383b30..d8a07a4f171dbfe21ee0e288d98658f304308735 100644 (file)
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -167,13 +167,14 @@ enum {
        SWP_SOLIDSTATE  = (1 << 4),     /* blkdev seeks are cheap */
        SWP_CONTINUED   = (1 << 5),     /* swap_map has count continuation */
        SWP_BLKDEV      = (1 << 6),     /* its a block device */
-       SWP_FILE        = (1 << 7),     /* set after swap_activate success */
-       SWP_AREA_DISCARD = (1 << 8),    /* single-time swap area discards */
-       SWP_PAGE_DISCARD = (1 << 9),    /* freed swap page-cluster discards */
-       SWP_STABLE_WRITES = (1 << 10),  /* no overwrite PG_writeback pages */
-       SWP_SYNCHRONOUS_IO = (1 << 11), /* synchronous IO is efficient */
+       SWP_ACTIVATED   = (1 << 7),     /* set after swap_activate success */
+       SWP_FS          = (1 << 8),     /* swap file goes through fs */
+       SWP_AREA_DISCARD = (1 << 9),    /* single-time swap area discards */
+       SWP_PAGE_DISCARD = (1 << 10),   /* freed swap page-cluster discards */
+       SWP_STABLE_WRITES = (1 << 11),  /* no overwrite PG_writeback pages */
+       SWP_SYNCHRONOUS_IO = (1 << 12), /* synchronous IO is efficient */
                                        /* add others here before... */
-       SWP_SCANNING    = (1 << 12),    /* refcount in scan_swap_map */
+       SWP_SCANNING    = (1 << 13),    /* refcount in scan_swap_map */
 };
 
 #define SWAP_CLUSTER_MAX 32UL
@@ -296,7 +297,7 @@ struct vma_swap_readahead {
 
 /* linux/mm/workingset.c */
 void *workingset_eviction(struct address_space *mapping, struct page *page);
-bool workingset_refault(void *shadow);
+void workingset_refault(struct page *page, void *shadow);
 void workingset_activation(struct page *page);
 
 /* Only track the nodes of mappings with shadow entries */