| Message ID | 20180612112918.25795-2-mb@lightnvm.io (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> On 12 Jun 2018, at 04.29, Matias Bjørling <mb@lightnvm.io> wrote: > > When recovering a line, an extra check was added when debugging was > active, such that minor version where also checked. Unfortunately, > this used the ifdef NVM_DEBUG, which is not correct. > > Instead use the proper DEBUG def, and now that it compiles, also fix > the variable. > > Signed-off-by: Matias Bjørling <mb@lightnvm.io> > Fixes: d0ab0b1ab991f ("lightnvm: pblk: check data lines version on recovery") > --- > drivers/lightnvm/pblk-recovery.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c > index 598342833d0d..b1a91cb3ca4d 100644 > --- a/drivers/lightnvm/pblk-recovery.c > +++ b/drivers/lightnvm/pblk-recovery.c > @@ -742,9 +742,10 @@ static int pblk_recov_check_line_version(struct pblk *pblk, > return 1; > } > > -#ifdef NVM_DEBUG > +#ifdef CONFIG_NVM_PBLK_DEBUG > if (header->version_minor > EMETA_VERSION_MINOR) > - pr_info("pblk: newer line minor version found: %d\n", line_v); > + pr_info("pblk: newer line minor version found: %d\n", > + header->version_minor); > #endif > > return 0; > -- > 2.11.0 Good catch. Reviewed-by: Javier González <javier@cnexlabs.com>
diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c index 598342833d0d..b1a91cb3ca4d 100644 --- a/drivers/lightnvm/pblk-recovery.c +++ b/drivers/lightnvm/pblk-recovery.c @@ -742,9 +742,10 @@ static int pblk_recov_check_line_version(struct pblk *pblk, return 1; } -#ifdef NVM_DEBUG +#ifdef CONFIG_NVM_PBLK_DEBUG if (header->version_minor > EMETA_VERSION_MINOR) - pr_info("pblk: newer line minor version found: %d\n", line_v); + pr_info("pblk: newer line minor version found: %d\n", + header->version_minor); #endif return 0;
When recovering a line, an extra check was added when debugging was active, such that minor version where also checked. Unfortunately, this used the ifdef NVM_DEBUG, which is not correct. Instead use the proper DEBUG def, and now that it compiles, also fix the variable. Signed-off-by: Matias Bjørling <mb@lightnvm.io> Fixes: d0ab0b1ab991f ("lightnvm: pblk: check data lines version on recovery") --- drivers/lightnvm/pblk-recovery.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)