[Drbd-dev] [patch 4/4] drivers/block/drbd/drbd_main.c: fix error path

[Drbd-dev] [patch 4/4] drivers/block/drbd/drbd_main.c: fix error path

[akpm]

From: Nicolas Kaiser <nikai@nikai.net>

Failure to create drbd_ee_mempool appears not to get checked.  Looks like
a copy-and-paste problem to me.

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
Cc: Philipp Reisner <philipp.reisner@linbit.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/block/drbd/drbd_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/block/drbd/drbd_main.c~drivers-block-drbd-drbd_mainc-fix-error-path drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_main.c~drivers-block-drbd-drbd_mainc-fix-error-path
+++ a/drivers/block/drbd/drbd_main.c
@@ -2982,7 +2982,7 @@ static int drbd_create_mempools(void)
 
 	drbd_ee_mempool = mempool_create(number,
 		mempool_alloc_slab, mempool_free_slab, drbd_ee_cache);
-	if (drbd_request_mempool == NULL)
+	if (drbd_ee_mempool == NULL)
 		goto Enomem;
 
 	/* drbd's page pool */
_

Re: [Drbd-dev] [patch 4/4] drivers/block/drbd/drbd_main.c: fix error path

[Philipp Reisner]

Hi Jens,

The patch is obviously correct.
Should I pick it up (and send you a pull req (later))? 
Are you going to pick it up directly?

Best,
 Phil

> From: Nicolas Kaiser <nikai@nikai.net>
> 
> Failure to create drbd_ee_mempool appears not to get checked.  Looks like
> a copy-and-paste problem to me.
> 
> Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
> Cc: Lars Ellenberg <drbd-dev@lists.linbit.com>
> Cc: Philipp Reisner <philipp.reisner@linbit.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
> 
>  drivers/block/drbd/drbd_main.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN
> drivers/block/drbd/drbd_main.c~drivers-block-drbd-drbd_mainc-fix-error-pat
> h drivers/block/drbd/drbd_main.c ---
> a/drivers/block/drbd/drbd_main.c~drivers-block-drbd-drbd_mainc-fix-error-p
> ath +++ a/drivers/block/drbd/drbd_main.c
> @@ -2982,7 +2982,7 @@ static int drbd_create_mempools(void)
> 
>  	drbd_ee_mempool = mempool_create(number,
>  		mempool_alloc_slab, mempool_free_slab, drbd_ee_cache);
> -	if (drbd_request_mempool == NULL)
> +	if (drbd_ee_mempool == NULL)
>  		goto Enomem;
> 
>  	/* drbd's page pool */
> _


-- 
: Dipl-Ing Philipp Reisner
: LINBIT | Your Way to High Availability
: Tel: +43-1-8178292-50, Fax: +43-1-8178292-82
: http://www.linbit.com

DRBD(R) and LINBIT(R) are registered trademarks of LINBIT, Austria.

Re: [Drbd-dev] [patch 4/4] drivers/block/drbd/drbd_main.c: fix error path

[Jens Axboe]

On 2010-10-28 02:22, Philipp Reisner wrote:
> Hi Jens,
> 
> The patch is obviously correct.
> Should I pick it up (and send you a pull req (later))? 
> Are you going to pick it up directly?

I am merging it now.

-- 
Jens Axboe