Linux-NVDIMM Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Jiang <dave.jiang@intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Dan Williams <dan.j.williams@intel.com>,
	Ross Zwisler <zwisler@kernel.org>,
	linux-nvdimm@lists.01.org,
	Vishal Verma <vishal.l.verma@intel.com>
Subject: Re: [PATCH v1] libnvdimm, label: Switch to bitmap_zalloc()
Date: Thu, 30 Aug 2018 14:46:19 -0700	[thread overview]
Message-ID: <c944d328-532f-c7b4-2a54-0c865e3b3e70@intel.com> (raw)
In-Reply-To: <20180830103207.60669-1-andriy.shevchenko@linux.intel.com>



On 08/30/2018 03:32 AM, Andy Shevchenko wrote:
> Switch to bitmap_zalloc() to show clearly what we are allocating.
> Besides that it returns pointer of bitmap type instead of opaque void *.
> 
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied

> ---
>  drivers/nvdimm/label.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/nvdimm/label.c b/drivers/nvdimm/label.c
> index 1d28cd656536..53159262c85d 100644
> --- a/drivers/nvdimm/label.c
> +++ b/drivers/nvdimm/label.c
> @@ -814,8 +814,7 @@ static int __blk_label_update(struct nd_region *nd_region,
>  	victims = 0;
>  	if (old_num_resources) {
>  		/* convert old local-label-map to dimm-slot victim-map */
> -		victim_map = kcalloc(BITS_TO_LONGS(nslot), sizeof(long),
> -				GFP_KERNEL);
> +		victim_map = bitmap_zalloc(nslot, GFP_KERNEL);
>  		if (!victim_map)
>  			return -ENOMEM;
>  
> @@ -838,7 +837,7 @@ static int __blk_label_update(struct nd_region *nd_region,
>  	/* don't allow updates that consume the last label */
>  	if (nfree - alloc < 0 || nfree - alloc + victims < 1) {
>  		dev_info(&nsblk->common.dev, "insufficient label space\n");
> -		kfree(victim_map);
> +		bitmap_free(victim_map);
>  		return -ENOSPC;
>  	}
>  	/* from here on we need to abort on error */
> @@ -1010,7 +1009,7 @@ static int __blk_label_update(struct nd_region *nd_region,
>  
>   out:
>  	kfree(old_res_list);
> -	kfree(victim_map);
> +	bitmap_free(victim_map);
>  	return rc;
>  
>   abort:
> 
_______________________________________________
Linux-nvdimm mailing list
Linux-nvdimm@lists.01.org
https://lists.01.org/mailman/listinfo/linux-nvdimm

      parent reply	other threads:[~2018-08-30 21:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-30 10:32 [PATCH v1] libnvdimm, label: Switch to bitmap_zalloc() Andy Shevchenko
2018-08-30 12:16 ` Johannes Thumshirn
2018-08-30 21:46 ` Dave Jiang [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=c944d328-532f-c7b4-2a54-0c865e3b3e70@intel.com \
    --to=dave.jiang@intel.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=linux-nvdimm@lists.01.org \
    --cc=vishal.l.verma@intel.com \
    --cc=zwisler@kernel.org \
    /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