2015-11-19 15:25:11

by Wenwei Tao

Subject: [PATCH] lightnvm: fix wrong return value and remove nvme_free(dev) in nvm_init()

The return value should be non-zero under error conditions.
Remove nvme_free(dev) to avoid free dev more than once.

Signed-off-by: Wenwei Tao <[email protected]>
---
drivers/lightnvm/core.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index f659e60..1942752 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -220,14 +220,13 @@ static void nvm_free(struct nvm_dev *dev)
static int nvm_init(struct nvm_dev *dev)
{
struct nvmm_type *mt;
- int ret = 0;
+ int ret = -EINVAL;

if (!dev->q || !dev->ops)
- return -EINVAL;
+ return ret;

if (dev->ops->identity(dev->q, &dev->identity)) {
pr_err("nvm: device could not be identified\n");
- ret = -EINVAL;
goto err;
}

@@ -273,7 +272,6 @@ static int nvm_init(struct nvm_dev *dev)
dev->nr_chnls);
return 0;
err:
- nvm_free(dev);
pr_err("nvm: failed to initialize nvm\n");
return ret;
}
--
1.9.1

2015-11-19 16:08:18

by Matias Bjørling

Subject: Re: [PATCH] lightnvm: fix wrong return value and remove nvme_free(dev) in nvm_init()

On 11/19/2015 04:23 PM, Wenwei Tao wrote:
> The return value should be non-zero under error conditions.
> Remove nvme_free(dev) to avoid free dev more than once.
>
> Signed-off-by: Wenwei Tao <[email protected]>
> ---
> drivers/lightnvm/core.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index f659e60..1942752 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -220,14 +220,13 @@ static void nvm_free(struct nvm_dev *dev)
> static int nvm_init(struct nvm_dev *dev)
> {
> struct nvmm_type *mt;
> - int ret = 0;
> + int ret = -EINVAL;
>
> if (!dev->q || !dev->ops)
> - return -EINVAL;
> + return ret;
>
> if (dev->ops->identity(dev->q, &dev->identity)) {
> pr_err("nvm: device could not be identified\n");
> - ret = -EINVAL;
> goto err;
> }
>
> @@ -273,7 +272,6 @@ static int nvm_init(struct nvm_dev *dev)
> dev->nr_chnls);
> return 0;
> err:
> - nvm_free(dev);
> pr_err("nvm: failed to initialize nvm\n");
> return ret;
> }
>

Applied, Thanks Tao.