Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6110d70b authored by Wei Yongjun's avatar Wei Yongjun Committed by Jens Axboe
Browse files

drbd: fix error return code in drbd_init() 



Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruen@linbit.com>
Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 26ea8f92

drivers/block/drbd/drbd_main.c

+1 −3
Original line number Diff line number Diff line
@@ -2762,8 +2762,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 */
@@ -2773,6 +2771,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");
@@ -2803,7 +2802,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");