diff options
| author | Dan Magenheimer <dan.magenheimer@oracle.com> | 2012-01-12 14:03:25 -0500 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:34 +1000 |
| commit | 06cdf4f03cc2a0beb383782320c4b02df7a0d94d (patch) | |
| tree | 465b1ed77a08b4670a1952a0112933c5160c233a /drivers/staging/zcache | |
| parent | 4c7cee5b45d355000398330faddd9e91a51dc643 (diff) | |
| download | kernel_samsung_smdk4412-06cdf4f03cc2a0beb383782320c4b02df7a0d94d.tar.gz kernel_samsung_smdk4412-06cdf4f03cc2a0beb383782320c4b02df7a0d94d.tar.bz2 kernel_samsung_smdk4412-06cdf4f03cc2a0beb383782320c4b02df7a0d94d.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 'drivers/staging/zcache')
| -rw-r--r-- | drivers/staging/zcache/zcache-main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index 276940d11ba..676e251aa4d 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -1810,9 +1810,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 }; @@ -1920,8 +1920,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 }; |