Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1587752 > unrolled thread

[PATCH 3/3] lightnvm: free reverse device map

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 3/3] lightnvm: free reverse device map "Javier González" <jg@lightnvm.io> - 2017-02-24 17:20 +0100
    Re: [PATCH 3/3] lightnvm: free reverse device map Matias Bjørling <mb@lightnvm.io> - 2017-02-24 18:10 +0100

#1587752 — [PATCH 3/3] lightnvm: free reverse device map

Free the reverse mapping table correctly on target tear down

Signed-off-by: Javier González <javier@cnexlabs.com>
---
 drivers/lightnvm/core.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index ca48792..f1cb485 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -413,6 +413,18 @@ static int nvm_register_map(struct nvm_dev *dev)
 	return -ENOMEM;
 }
 
+static void nvm_unregister_map(struct nvm_dev *dev)
+{
+	struct nvm_dev_map *rmap = dev->rmap;
+	int i;
+
+	for (i = 0; i < dev->geo.nr_chnls; i++)
+		kfree(rmap->chnls[i].lun_offs);
+
+	kfree(rmap->chnls);
+	kfree(rmap);
+}
+
 static void nvm_map_to_dev(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p)
 {
 	struct nvm_dev_map *dev_map = tgt_dev->map;
@@ -994,7 +1006,7 @@ void nvm_free(struct nvm_dev *dev)
 	if (dev->dma_pool)
 		dev->ops->destroy_dma_pool(dev->dma_pool);
 
-	kfree(dev->rmap);
+	nvm_unregister_map(dev);
 	kfree(dev->lptbl);
 	kfree(dev->lun_map);
 	kfree(dev);
-- 
2.7.4

[toc] | [next] | [standalone]

#1587803

On 02/24/2017 05:14 PM, Javier González wrote:
> Free the reverse mapping table correctly on target tear down
>
> Signed-off-by: Javier González <javier@cnexlabs.com>
> ---
>  drivers/lightnvm/core.c | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index ca48792..f1cb485 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -413,6 +413,18 @@ static int nvm_register_map(struct nvm_dev *dev)
>  	return -ENOMEM;
>  }
>
> +static void nvm_unregister_map(struct nvm_dev *dev)
> +{
> +	struct nvm_dev_map *rmap = dev->rmap;
> +	int i;
> +
> +	for (i = 0; i < dev->geo.nr_chnls; i++)
> +		kfree(rmap->chnls[i].lun_offs);
> +
> +	kfree(rmap->chnls);
> +	kfree(rmap);
> +}
> +
>  static void nvm_map_to_dev(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p)
>  {
>  	struct nvm_dev_map *dev_map = tgt_dev->map;
> @@ -994,7 +1006,7 @@ void nvm_free(struct nvm_dev *dev)
>  	if (dev->dma_pool)
>  		dev->ops->destroy_dma_pool(dev->dma_pool);
>
> -	kfree(dev->rmap);
> +	nvm_unregister_map(dev);
>  	kfree(dev->lptbl);
>  	kfree(dev->lun_map);
>  	kfree(dev);
>
Thanks, applied for 4.12.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web