aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen/tmem.c
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2013-04-30 18:26:57 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 20:04:01 -0400
commit833f8662af9659508afc3cb80f09138eade378e2 (patch)
treefffd8a1328c55a6ec8ac1159d1258e28d8ca7cec /drivers/xen/tmem.c
parent49a9ab815acb8379a2f5fd43abe40038821e8f87 (diff)
cleancache: Make cleancache_init use a pointer for the ops
Instead of using a backend_registered to determine whether a backend is enabled. This allows us to remove the backend_register check and just do 'if (cleancache_ops)' [v1: Rebase on top of b97c4b430b0a (ramster->zcache move] Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Bob Liu <lliubbo@gmail.com> Cc: Wanpeng Li <liwanp@linux.vnet.ibm.com> Cc: Andor Daam <andor.daam@googlemail.com> Cc: Dan Magenheimer <dan.magenheimer@oracle.com> Cc: Florian Schmaus <fschmaus@gmail.com> Cc: Minchan Kim <minchan@kernel.org> Cc: Stefan Hengelein <ilendir@googlemail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/xen/tmem.c')
-rw-r--r--drivers/xen/tmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 7a01a5fd0f63..fd79eab08368 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -236,7 +236,7 @@ static int __init no_cleancache(char *s)
236} 236}
237__setup("nocleancache", no_cleancache); 237__setup("nocleancache", no_cleancache);
238 238
239static struct cleancache_ops __initdata tmem_cleancache_ops = { 239static struct cleancache_ops tmem_cleancache_ops = {
240 .put_page = tmem_cleancache_put_page, 240 .put_page = tmem_cleancache_put_page,
241 .get_page = tmem_cleancache_get_page, 241 .get_page = tmem_cleancache_get_page,
242 .invalidate_page = tmem_cleancache_flush_page, 242 .invalidate_page = tmem_cleancache_flush_page,
@@ -392,9 +392,9 @@ static int __init xen_tmem_init(void)
392 BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid)); 392 BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid));
393 if (tmem_enabled && use_cleancache) { 393 if (tmem_enabled && use_cleancache) {
394 char *s = ""; 394 char *s = "";
395 struct cleancache_ops old_ops = 395 struct cleancache_ops *old_ops =
396 cleancache_register_ops(&tmem_cleancache_ops); 396 cleancache_register_ops(&tmem_cleancache_ops);
397 if (old_ops.init_fs != NULL) 397 if (old_ops)
398 s = " (WARNING: cleancache_ops overridden)"; 398 s = " (WARNING: cleancache_ops overridden)";
399 printk(KERN_INFO "cleancache enabled, RAM provided by " 399 printk(KERN_INFO "cleancache enabled, RAM provided by "
400 "Xen Transcendent Memory%s\n", s); 400 "Xen Transcendent Memory%s\n", s);