[PATCH] lightnvm: Avoid validation of default op value Avoid validation of default op value, if default value is given. In preparation of using the rsvd field of the extended config for additional paramters while using default op.

[PATCH] lightnvm: Avoid validation of default op value Avoid validation of default op value, if default value is given. In preparation of using the rsvd field of the extended config for additional paramters while using default op.

[Heiner Litz]

 Fixes: 38401d231de65 ("lightnvm: set target over-provision on create ioctl")

Signed-off-by: Heiner Litz <hlitz@ucsc.edu>
---
 drivers/lightnvm/core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index dcc9e621e651..4e6095e2af06 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -304,10 +304,9 @@ static int __nvm_config_extended(struct nvm_dev *dev,
 	}
 
 	/* op not set falls into target's default */
-	if (e->op == 0xFFFF)
+	if (e->op == 0xFFFF) {
 		e->op = NVM_TARGET_DEFAULT_OP;
-
-	if (e->op < NVM_TARGET_MIN_OP ||
+	} else if (e->op < NVM_TARGET_MIN_OP ||
 	    e->op > NVM_TARGET_MAX_OP) {
 		pr_err("nvm: invalid over provisioning value\n");
 		return -EINVAL;
-- 
2.14.1

Re: [PATCH] lightnvm: Avoid validation of default op value Avoid validation of default op value, if default value is given. In preparation of using the rsvd field of the extended config for additional paramters while using default op.

[Javier Gonzalez]

[-- Attachment #1: Type: text/plain, Size: 1238 bytes --]

> On 26 Feb 2018, at 20.45, Heiner Litz <hlitz@ucsc.edu> wrote:
> 
> Fixes: 38401d231de65 ("lightnvm: set target over-provision on create ioctl")
> 
> Signed-off-by: Heiner Litz <hlitz@ucsc.edu>
> ---
> drivers/lightnvm/core.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index dcc9e621e651..4e6095e2af06 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -304,10 +304,9 @@ static int __nvm_config_extended(struct nvm_dev *dev,
> 	}
> 
> 	/* op not set falls into target's default */
> -	if (e->op == 0xFFFF)
> +	if (e->op == 0xFFFF) {
> 		e->op = NVM_TARGET_DEFAULT_OP;
> -
> -	if (e->op < NVM_TARGET_MIN_OP ||
> +	} else if (e->op < NVM_TARGET_MIN_OP ||
> 	    e->op > NVM_TARGET_MAX_OP) {

While you are at it, can you fix this and put it in a single line - not
sure why this ended up this way...

> 		pr_err("nvm: invalid over provisioning value\n");
> 		return -EINVAL;
> --
> 2.14.1

Apart from the comment, the patch looks good. However, the description
went over to the subject. I guess Matias can fix this when picking it
up.

Reviewed-by: Javier González <javier@cnexlabs.com>


[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 833 bytes --]