* [PATCH -next] drbd: fix error return code in drbd_init()
@ 2013-04-04 6:17 Wei Yongjun
2013-04-04 18:58 ` [Drbd-dev] " Lars Ellenberg
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-04-04 6:17 UTC (permalink / raw)
To: drbd-dev; +Cc: yongjun_wei, drbd-user, linux-kernel
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/block/drbd/drbd_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 1b93a726..768bca9 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2777,6 +2777,7 @@ int __init drbd_init(void)
drbd_proc = proc_create_data("drbd", S_IFREG | S_IRUGO , NULL, &drbd_proc_fops, NULL);
if (!drbd_proc) {
printk(KERN_ERR "drbd: unable to register proc file\n");
+ err = -ENOMEM;
goto fail;
}
@@ -2786,6 +2787,7 @@ int __init drbd_init(void)
retry.wq = create_singlethread_workqueue("drbd-reissue");
if (!retry.wq) {
printk(KERN_ERR "drbd: unable to create retry workqueue\n");
+ err = -ENOMEM;
goto fail;
}
INIT_WORK(&retry.worker, do_retry);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Drbd-dev] [PATCH -next] drbd: fix error return code in drbd_init()
2013-04-04 6:17 [PATCH -next] drbd: fix error return code in drbd_init() Wei Yongjun
@ 2013-04-04 18:58 ` Lars Ellenberg
0 siblings, 0 replies; 2+ messages in thread
From: Lars Ellenberg @ 2013-04-04 18:58 UTC (permalink / raw)
To: Wei Yongjun; +Cc: drbd-dev, yongjun_wei, linux-kernel, drbd-user
On Thu, Apr 04, 2013 at 02:17:09PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in this function.
We used to have an err = -ENOMEM; "just in case"...
How about this instead:
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index e98da67..dfe52d6 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2739,8 +2739,6 @@ int __init drbd_init(void)
/*
* allocate all necessary structs
*/
- err = -ENOMEM;
-
init_waitqueue_head(&drbd_pp_wait);
drbd_proc = NULL; /* play safe for drbd_cleanup */
@@ -2750,6 +2748,7 @@ int __init drbd_init(void)
if (err)
goto fail;
+ err = -ENOMEM;
drbd_proc = proc_create_data("drbd", S_IFREG | S_IRUGO , NULL, &drbd_proc_fops, NULL);
if (!drbd_proc) {
printk(KERN_ERR "drbd: unable to register proc file\n");
@@ -2780,7 +2779,6 @@ int __init drbd_init(void)
fail:
drbd_cleanup();
if (err == -ENOMEM)
- /* currently always the case */
printk(KERN_ERR "drbd: ran out of memory\n");
else
printk(KERN_ERR "drbd: initialization failure\n");
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-04 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-04 6:17 [PATCH -next] drbd: fix error return code in drbd_init() Wei Yongjun
2013-04-04 18:58 ` [Drbd-dev] " Lars Ellenberg
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).