Merge branch 'stable/cleancache.v13' into linux-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / zcache / zcache-main.c

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index ef7c52bb1df9f014d853d8a221dd15077efbc340..875acd824b2366938ec622e44cb62bdc53442322 100644 (file)
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1757,9 +1757,9 @@ static int zcache_cleancache_init_shared_fs(char *uuid, size_t pagesize)
 static struct cleancache_ops zcache_cleancache_ops = {
        .put_page = zcache_cleancache_put_page,
        .get_page = zcache_cleancache_get_page,
-       .flush_page = zcache_cleancache_flush_page,
-       .flush_inode = zcache_cleancache_flush_inode,
-       .flush_fs = zcache_cleancache_flush_fs,
+       .invalidate_page = zcache_cleancache_flush_page,
+       .invalidate_inode = zcache_cleancache_flush_inode,
+       .invalidate_fs = zcache_cleancache_flush_fs,
        .init_shared_fs = zcache_cleancache_init_shared_fs,
        .init_fs = zcache_cleancache_init_fs
 };
@@ -1867,8 +1867,8 @@ static void zcache_frontswap_init(unsigned ignored)
 static struct frontswap_ops zcache_frontswap_ops = {
        .put_page = zcache_frontswap_put_page,
        .get_page = zcache_frontswap_get_page,
-       .flush_page = zcache_frontswap_flush_page,
-       .flush_area = zcache_frontswap_flush_area,
+       .invalidate_page = zcache_frontswap_flush_page,
+       .invalidate_area = zcache_frontswap_flush_area,
        .init = zcache_frontswap_init
 };