The patch titled
Subject: zcache/tmem: Better error checking on frontswap_register_ops return value.
has been removed from the -mm tree. Its filename was
zcache-tmem-better-error-checking-on-frontswap_register_ops-return-value.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Subject: zcache/tmem: Better error checking on frontswap_register_ops return value.
In the past it either used to be NULL or the "older" backend. Now we
also return -Exx error codes.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
Signed-off-by: Bob Liu <lliubbo@xxxxxxxxx>
Cc: Wanpeng Li <liwanp@xxxxxxxxxxxxxxxxxx>
Cc: Andor Daam <andor.daam@xxxxxxxxxxxxxx>
Cc: Dan Magenheimer <dan.magenheimer@xxxxxxxxxx>
Cc: Florian Schmaus <fschmaus@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Stefan Hengelein <ilendir@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/staging/zcache/zcache-main.c | 5 ++++-
drivers/xen/tmem.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff -puN drivers/staging/zcache/zcache-main.c~zcache-tmem-better-error-checking-on-frontswap_register_ops-return-value drivers/staging/zcache/zcache-main.c
--- a/drivers/staging/zcache/zcache-main.c~zcache-tmem-better-error-checking-on-frontswap_register_ops-return-value
+++ a/drivers/staging/zcache/zcache-main.c
@@ -1886,8 +1886,11 @@ static int __init zcache_init(void)
namestr, frontswap_has_exclusive_gets,
!disable_frontswap_ignore_nonactive);
#endif
- if (old_ops != NULL)
+ if (IS_ERR(old_ops) || old_ops) {
+ if (IS_ERR(old_ops))
+ return PTR_RET(old_ops);
pr_warn("%s: frontswap_ops overridden\n", namestr);
+ }
}
if (ramster_enabled)
ramster_init(!disable_cleancache, !disable_frontswap,
diff -puN drivers/xen/tmem.c~zcache-tmem-better-error-checking-on-frontswap_register_ops-return-value drivers/xen/tmem.c
--- a/drivers/xen/tmem.c~zcache-tmem-better-error-checking-on-frontswap_register_ops-return-value
+++ a/drivers/xen/tmem.c
@@ -397,8 +397,11 @@ static int xen_tmem_init(void)
frontswap_register_ops(&tmem_frontswap_ops);
tmem_frontswap_poolid = -1;
- if (old_ops)
+ if (IS_ERR(old_ops) || old_ops) {
+ if (IS_ERR(old_ops))
+ return PTR_ERR(old_ops);
s = " (WARNING: frontswap_ops overridden)";
+ }
printk(KERN_INFO "frontswap enabled, RAM provided by "
"Xen Transcendent Memory%s\n", s);
}
_
Patches currently in -mm which might be from konrad.wilk@xxxxxxxxxx are
origin.patch
linux-next.patch
mm-add-vm-event-counters-for-balloon-pages-compaction.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
