mm: zcache/tmem/cleancache: s/flush/invalidate/

Complete the renaming from "flush" to "invalidate" across
both tmem frontends (cleancache and frontswap) and both tmem backends
(Xen and zcache), as required by akpm.

This change is completely cosmetic.

[v10: no change]
[v9: akpm@linux-foundation.org: change "flush" to "invalidate", part 3]
Signed-off-by: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Jan Beulich <JBeulich@novell.com>
Acked-by: Seth Jennings <sjenning@linux.vnet.ibm.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Cc: Matthew Wilcox <matthew@wil.cx>
Cc: Chris Mason <chris.mason@oracle.com>
Cc: Rik Riel <riel@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
[v11: Remove the frontswap part]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 56c1f9c80dc14fed040f23b5c471cdf1fe214d00..49c8791462f46e4a33f923d2b0219c26bf9ac18a 100644 (file)
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -1758,9 +1758,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
 };
@@ -1868,8 +1868,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 d369965e8f8a9aa3bbba58f284acb964b56c272e..17d9e37beba418d8a5cdf132e643b76e3f5d19f8 100644 (file)
--- 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

diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
index 66fb63b243a8f418c6eaff8df1fbff965123ab9d..42e55deee7570e231017bd1cd589fb3dd641bfc1 100644 (file)
--- a/include/linux/cleancache.h
+++ b/include/linux/cleancache.h
@@ -28,14 +28,9 @@ struct cleancache_ops {
                        pgoff_t, struct page *);
        void (*put_page)(int, struct cleancache_filekey,
                        pgoff_t, struct page *);
-       /*
-        * NOTE: per akpm, flush_page, flush_inode and flush_fs will be
-        * renamed to invalidate_* in a later commit in which all
-        * dependencies (i.e Xen, zcache) will be renamed simultaneously
-        */
-       void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
-       void (*flush_inode)(int, struct cleancache_filekey);
-       void (*flush_fs)(int);
+       void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
+       void (*invalidate_inode)(int, struct cleancache_filekey);
+       void (*invalidate_fs)(int);
 };
 
 extern struct cleancache_ops

diff --git a/mm/cleancache.c b/mm/cleancache.c
index 237c6e0feea058e6f30ce6727daa073a20ac8e65..b9c198bc6980235e087a95288fc00d927872759e 100644 (file)
--- a/mm/cleancache.c
+++ b/mm/cleancache.c
@@ -161,7 +161,8 @@ void __cleancache_invalidate_page(struct address_space *mapping,
        if (pool_id >= 0) {
                VM_BUG_ON(!PageLocked(page));
                if (cleancache_get_key(mapping->host, &key) >= 0) {
-                       (*cleancache_ops.flush_page)(pool_id, key, page->index);
+                       (*cleancache_ops.invalidate_page)(pool_id,
+                                                         key, page->index);
                        cleancache_flushes++;
                }
        }
@@ -179,7 +180,7 @@ void __cleancache_invalidate_inode(struct address_space *mapping)
        struct cleancache_filekey key = { .u.key = { 0 } };
 
        if (pool_id >= 0 && cleancache_get_key(mapping->host, &key) >= 0)
-               (*cleancache_ops.flush_inode)(pool_id, key);
+               (*cleancache_ops.invalidate_inode)(pool_id, key);
 }
 EXPORT_SYMBOL(__cleancache_invalidate_inode);
 
@@ -193,7 +194,7 @@ void __cleancache_invalidate_fs(struct super_block *sb)
        if (sb->cleancache_poolid >= 0) {
                int old_poolid = sb->cleancache_poolid;
                sb->cleancache_poolid = -1;
-               (*cleancache_ops.flush_fs)(old_poolid);
+               (*cleancache_ops.invalidate_fs)(old_poolid);
        }
 }
 EXPORT_SYMBOL(__cleancache_invalidate_fs);