On Tue, Jan 27, 2015 at 7:38 AM, Sudip Mukherjee
<sudipm.mukher...@gmail.com> wrote:
> we have already allocated memory for nbd_dev, but we were not
> releasing that memory and just returning the error value.
>
> Signed-off-by: Sudip Mukherjee <su...@vectorindia.org>
Looks good to me.
Acked-by: Paul Clements <paul.cleme...@steeleye.com>
> ---
>
> v2: moved kcalloc after the returns.
>
> drivers/block/nbd.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
> index 4bc2a5c..db93c75 100644
> --- a/drivers/block/nbd.c
> +++ b/drivers/block/nbd.c
> @@ -803,10 +803,6 @@ static int __init nbd_init(void)
> return -EINVAL;
> }
>
> - nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
> - if (!nbd_dev)
> - return -ENOMEM;
> -
> part_shift = 0;
> if (max_part > 0) {
> part_shift = fls(max_part);
> @@ -827,6 +823,10 @@ static int __init nbd_init(void)
>
> if (nbds_max > 1UL << (MINORBITS - part_shift))
> return -EINVAL;
> +
> + nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
> + if (!nbd_dev)
> + return -ENOMEM;
>
> for (i = 0; i < nbds_max; i++) {
> struct gendisk *disk = alloc_disk(1 << part_shift);
> --
> 1.8.1.2
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
