From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: dan.magenheimer@oracle.com, sjenning@linux.vnet.ibm.com,
gregkh@linuxfoundation.org, akpm@linux-foundation.org,
ngupta@vflare.org, rcj@linux.vnet.ibm.com, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
minchan@kernel.org
Cc: ric.masonn@gmail.com, lliubbo@gmail.com,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 11/11] zcache/tmem: Better error checking on frontswap_register_ops return value.
Date: Fri, 15 Feb 2013 15:20:35 -0500 [thread overview]
Message-ID: <1360959635-18922-12-git-send-email-konrad.wilk@oracle.com> (raw)
In-Reply-To: <1360959635-18922-1-git-send-email-konrad.wilk@oracle.com>
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@oracle.com>
---
drivers/staging/zcache/zcache-main.c | 5 ++++-
drivers/xen/tmem.c | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index 3554987..48e46c5 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -2006,8 +2006,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 --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 9a4a9ec..2f939e5 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -395,8 +395,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\n");
}
--
1.8.0.2
prev parent reply other threads:[~2013-02-15 20:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-15 20:20 [PATCH v3] Make frontswap+cleancache and its friend be modularized Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 01/11] mm: frontswap: lazy initialization to allow tmem backends to build/run as modules Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 02/11] frontswap: Make frontswap_init use a pointer for the ops Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 03/11] frontswap: Remove the check for frontswap_enabled Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 04/11] frontswap: Use static_key instead of frontswap_enabled and frontswap_ops Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 05/11] frontswap: Get rid of swap_lock dependency Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 06/11] mm: cleancache: lazy initialization to allow tmem backends to build/run as modules Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 07/11] cleancache: Make cleancache_init use a pointer for the ops Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 08/11] cleancache: Remove the check for cleancache_enabled Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 09/11] cleancache: Use static_key instead of cleancache_ops and cleancache_enabled Konrad Rzeszutek Wilk
2013-02-15 20:20 ` [PATCH 10/11] xen: tmem: enable Xen tmem shim to be built/loaded as a module Konrad Rzeszutek Wilk
2013-02-15 20:20 ` Konrad Rzeszutek Wilk [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1360959635-18922-12-git-send-email-konrad.wilk@oracle.com \
--to=konrad.wilk@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=dan.magenheimer@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lliubbo@gmail.com \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=rcj@linux.vnet.ibm.com \
--cc=ric.masonn@gmail.com \
--cc=sjenning@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).