diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-19 12:12:19 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-19 12:12:19 -0400 |
| commit | 16c0cfa425b8e1488f7a1873bd112a7a099325f0 (patch) | |
| tree | eeba5728a8072096279c55ffc10a5ca7ac0ddf05 /drivers | |
| parent | 94574d9a4c236e8bd19721b4adb0ea30ef446901 (diff) | |
| parent | 072611ed1f291053a74b28b813d683a09495eba7 (diff) | |
| download | linux-stable-16c0cfa425b8e1488f7a1873bd112a7a099325f0.tar.gz linux-stable-16c0cfa425b8e1488f7a1873bd112a7a099325f0.tar.bz2 linux-stable-16c0cfa425b8e1488f7a1873bd112a7a099325f0.zip | |
Merge branch 'stable/cleancache.v13' into linux-next
* stable/cleancache.v13:
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/
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/zcache/zcache-main.c | 10 | ||||
| -rw-r--r-- | drivers/xen/tmem.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c index ef7c52bb1df9..875acd824b23 100644 --- a/drivers/staging/zcache/zcache-main.c +++ b/drivers/staging/zcache/zcache-main.c @@ -1757,9 +1757,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 }; @@ -1867,8 +1867,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 |