Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / xen / tmem.c

diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 6a8f76dd5a22e319bfe7e40f5dcee41fa3e1d2cc..dcb79521e6c8c256769c75295f90fb3444a8eaec 100644 (file)
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -238,9 +238,9 @@ __setup("nocleancache", no_cleancache);
 static struct cleancache_ops __initdata tmem_cleancache_ops = {
        .put_page = tmem_cleancache_put_page,
        .get_page = tmem_cleancache_get_page,
-       .flush_page = tmem_cleancache_flush_page,
-       .flush_inode = tmem_cleancache_flush_inode,
-       .flush_fs = tmem_cleancache_flush_fs,
+       .invalidate_page = tmem_cleancache_flush_page,
+       .invalidate_inode = tmem_cleancache_flush_inode,
+       .invalidate_fs = tmem_cleancache_flush_fs,
        .init_shared_fs = tmem_cleancache_init_shared_fs,
        .init_fs = tmem_cleancache_init_fs
 };
@@ -364,8 +364,8 @@ __setup("nofrontswap", no_frontswap);
 static struct frontswap_ops __initdata tmem_frontswap_ops = {
        .put_page = tmem_frontswap_put_page,
        .get_page = tmem_frontswap_get_page,
-       .flush_page = tmem_frontswap_flush_page,
-       .flush_area = tmem_frontswap_flush_area,
+       .invalidate_page = tmem_frontswap_flush_page,
+       .invalidate_area = tmem_frontswap_flush_area,
        .init = tmem_frontswap_init
 };
 #endif