aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDan Magenheimer <dan.magenheimer@oracle.com>2012-01-12 14:03:25 -0500
committerZiyan <jaraidaniel@gmail.com>2016-01-05 18:21:00 +0100
commit45fb4a2ec6d4efe1cb7c79d4ae12f0b01b203740 (patch)
tree0b235137533ff7c86a1c608fa994893387f1232a /mm
parent48eb19bbfab1a3a9ba6c7f8690532200209bd0c8 (diff)
downloadkernel_samsung_tuna-45fb4a2ec6d4efe1cb7c79d4ae12f0b01b203740.tar.gz
kernel_samsung_tuna-45fb4a2ec6d4efe1cb7c79d4ae12f0b01b203740.tar.bz2
kernel_samsung_tuna-45fb4a2ec6d4efe1cb7c79d4ae12f0b01b203740.zip
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> Conflicts: drivers/xen/tmem.c include/linux/cleancache.h Change-Id: Id9661e5fc4bb6f416129f38c1e3df80319653041
Diffstat (limited to 'mm')
-rw-r--r--mm/cleancache.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/cleancache.c b/mm/cleancache.c
index bcaae4c2a77..83a82414283 100644
--- a/mm/cleancache.c
+++ b/mm/cleancache.c
@@ -160,7 +160,8 @@ void __cleancache_flush_page(struct address_space *mapping, struct page *page)
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++;
}
}
@@ -178,7 +179,7 @@ void __cleancache_flush_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_flush_inode);
@@ -192,7 +193,7 @@ void __cleancache_flush_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_flush_fs);