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

Pull cleancache changes from Konrad Rzeszutek Wilk:
 "This has some patches for the cleancache API that should have been
  submitted a _long_ time ago.  They are basically cleanups:

   - rename of flush to invalidate

   - moving reporting of statistics into debugfs

   - use __read_mostly as necessary.

  Oh, and also the MAINTAINERS file change.  The files (except the
  MAINTAINERS file) have been in #linux-next for months now.  The late
  addition of MAINTAINERS file is a brain-fart on my side - didn't
  realize I needed that just until I was typing this up - and I based
  that patch on v3.3 - so the tree is on top of v3.3."

* tag 'stable/for-linus-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:
  MAINTAINERS: Adding cleancache API to the list.
  mm: cleancache: Use __read_mostly as appropiate.
  mm: cleancache: report statistics via debugfs instead of sysfs.
  mm: zcache/tmem/cleancache: s/flush/invalidate/
  mm: cleancache: s/flush/invalidate/

2 files changed, 10 insertions, 10 deletions

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index ed2c800b3a7e..2734dacacbaf 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1811,9 +1811,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
 };
@@ -1921,8 +1921,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
 };
 
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index d369965e8f8a..17d9e37beba4 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -242,9 +242,9 @@ __setup("nocleancache", no_cleancache);
 static struct cleancache_ops 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
 };
@@ -369,8 +369,8 @@ __setup("nofrontswap", no_frontswap);
 static struct frontswap_ops 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