diff options
author | Dan Magenheimer <dan.magenheimer@oracle.com> | 2012-01-12 14:03:25 -0500 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-01-23 16:06:37 -0500 |
commit | 91c6cc9b5c216bd067f9af2cc64fcbe190755865 (patch) | |
tree | 83cbad6659c180ac8fbeca61382ac41ccbd7b382 /mm | |
parent | 3167760f83899ccda312b9ad9306ec9e5dda06d4 (diff) |
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>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/cleancache.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/cleancache.c b/mm/cleancache.c index 237c6e0feea0..b9c198bc6980 100644 --- a/mm/cleancache.c +++ b/mm/cleancache.c | |||
@@ -161,7 +161,8 @@ void __cleancache_invalidate_page(struct address_space *mapping, | |||
161 | if (pool_id >= 0) { | 161 | if (pool_id >= 0) { |
162 | VM_BUG_ON(!PageLocked(page)); | 162 | VM_BUG_ON(!PageLocked(page)); |
163 | if (cleancache_get_key(mapping->host, &key) >= 0) { | 163 | if (cleancache_get_key(mapping->host, &key) >= 0) { |
164 | (*cleancache_ops.flush_page)(pool_id, key, page->index); | 164 | (*cleancache_ops.invalidate_page)(pool_id, |
165 | key, page->index); | ||
165 | cleancache_flushes++; | 166 | cleancache_flushes++; |
166 | } | 167 | } |
167 | } | 168 | } |
@@ -179,7 +180,7 @@ void __cleancache_invalidate_inode(struct address_space *mapping) | |||
179 | struct cleancache_filekey key = { .u.key = { 0 } }; | 180 | struct cleancache_filekey key = { .u.key = { 0 } }; |
180 | 181 | ||
181 | if (pool_id >= 0 && cleancache_get_key(mapping->host, &key) >= 0) | 182 | if (pool_id >= 0 && cleancache_get_key(mapping->host, &key) >= 0) |
182 | (*cleancache_ops.flush_inode)(pool_id, key); | 183 | (*cleancache_ops.invalidate_inode)(pool_id, key); |
183 | } | 184 | } |
184 | EXPORT_SYMBOL(__cleancache_invalidate_inode); | 185 | EXPORT_SYMBOL(__cleancache_invalidate_inode); |
185 | 186 | ||
@@ -193,7 +194,7 @@ void __cleancache_invalidate_fs(struct super_block *sb) | |||
193 | if (sb->cleancache_poolid >= 0) { | 194 | if (sb->cleancache_poolid >= 0) { |
194 | int old_poolid = sb->cleancache_poolid; | 195 | int old_poolid = sb->cleancache_poolid; |
195 | sb->cleancache_poolid = -1; | 196 | sb->cleancache_poolid = -1; |
196 | (*cleancache_ops.flush_fs)(old_poolid); | 197 | (*cleancache_ops.invalidate_fs)(old_poolid); |
197 | } | 198 | } |
198 | } | 199 | } |
199 | EXPORT_SYMBOL(__cleancache_invalidate_fs); | 200 | EXPORT_SYMBOL(__cleancache_invalidate_fs); |