* [PATCH 5/6] lightnvm: pblk: print incompatible line version correctly
@ 2017-09-21 11:28 Rakesh Pandit
2017-09-22 9:01 ` Javier González
0 siblings, 1 reply; 3+ messages in thread
From: Rakesh Pandit @ 2017-09-21 11:28 UTC (permalink / raw)
To: Matias Bjørling, linux-block, linux-kernel; +Cc: Javier González
Correct it by coverting little endian to cpu endian and also define a
macro for line version so that maintenance is easy.
Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
---
drivers/lightnvm/pblk-core.c | 2 +-
drivers/lightnvm/pblk-recovery.c | 4 ++--
drivers/lightnvm/pblk.h | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
index 74ddb30..57583a1 100644
--- a/drivers/lightnvm/pblk-core.c
+++ b/drivers/lightnvm/pblk-core.c
@@ -991,7 +991,7 @@ static int pblk_line_init_metadata(struct pblk *pblk, struct pblk_line *line,
memcpy(smeta_buf->header.uuid, pblk->instance_uuid, 16);
smeta_buf->header.id = cpu_to_le32(line->id);
smeta_buf->header.type = cpu_to_le16(line->type);
- smeta_buf->header.version = cpu_to_le16(1);
+ smeta_buf->header.version = SMETA_VERSION;
/* Start metadata */
smeta_buf->seq_nr = cpu_to_le64(line->seq_nr);
diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
index 1869eef..686bc17 100644
--- a/drivers/lightnvm/pblk-recovery.c
+++ b/drivers/lightnvm/pblk-recovery.c
@@ -876,9 +876,9 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk)
if (le32_to_cpu(smeta_buf->header.identifier) != PBLK_MAGIC)
continue;
- if (le16_to_cpu(smeta_buf->header.version) != 1) {
+ if (smeta_buf->header.version != SMETA_VERSION) {
pr_err("pblk: found incompatible line version %u\n",
- smeta_buf->header.version);
+ le16_to_cpu(smeta_buf->header.version));
return ERR_PTR(-EINVAL);
}
diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
index eaf5397..87b1d7f 100644
--- a/drivers/lightnvm/pblk.h
+++ b/drivers/lightnvm/pblk.h
@@ -318,6 +318,7 @@ enum {
};
#define PBLK_MAGIC 0x70626c6b /*pblk*/
+#define SMETA_VERSION cpu_to_le16(1)
struct line_header {
__le32 crc;
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 5/6] lightnvm: pblk: print incompatible line version correctly
2017-09-21 11:28 [PATCH 5/6] lightnvm: pblk: print incompatible line version correctly Rakesh Pandit
@ 2017-09-22 9:01 ` Javier González
2017-09-25 10:15 ` Matias Bjørling
0 siblings, 1 reply; 3+ messages in thread
From: Javier González @ 2017-09-22 9:01 UTC (permalink / raw)
To: Rakesh Pandit; +Cc: Matias Bjørling, linux-block, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2214 bytes --]
> On 21 Sep 2017, at 13.28, Rakesh Pandit <rakesh@tuxera.com> wrote:
>
> Correct it by coverting little endian to cpu endian and also define a
> macro for line version so that maintenance is easy.
>
> Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
> ---
> drivers/lightnvm/pblk-core.c | 2 +-
> drivers/lightnvm/pblk-recovery.c | 4 ++--
> drivers/lightnvm/pblk.h | 1 +
> 3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
> index 74ddb30..57583a1 100644
> --- a/drivers/lightnvm/pblk-core.c
> +++ b/drivers/lightnvm/pblk-core.c
> @@ -991,7 +991,7 @@ static int pblk_line_init_metadata(struct pblk *pblk, struct pblk_line *line,
> memcpy(smeta_buf->header.uuid, pblk->instance_uuid, 16);
> smeta_buf->header.id = cpu_to_le32(line->id);
> smeta_buf->header.type = cpu_to_le16(line->type);
> - smeta_buf->header.version = cpu_to_le16(1);
> + smeta_buf->header.version = SMETA_VERSION;
>
> /* Start metadata */
> smeta_buf->seq_nr = cpu_to_le64(line->seq_nr);
> diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
> index 1869eef..686bc17 100644
> --- a/drivers/lightnvm/pblk-recovery.c
> +++ b/drivers/lightnvm/pblk-recovery.c
> @@ -876,9 +876,9 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk)
> if (le32_to_cpu(smeta_buf->header.identifier) != PBLK_MAGIC)
> continue;
>
> - if (le16_to_cpu(smeta_buf->header.version) != 1) {
> + if (smeta_buf->header.version != SMETA_VERSION) {
> pr_err("pblk: found incompatible line version %u\n",
> - smeta_buf->header.version);
> + le16_to_cpu(smeta_buf->header.version));
> return ERR_PTR(-EINVAL);
> }
>
> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
> index eaf5397..87b1d7f 100644
> --- a/drivers/lightnvm/pblk.h
> +++ b/drivers/lightnvm/pblk.h
> @@ -318,6 +318,7 @@ enum {
> };
>
> #define PBLK_MAGIC 0x70626c6b /*pblk*/
> +#define SMETA_VERSION cpu_to_le16(1)
>
> struct line_header {
> __le32 crc;
> --
> 2.5.0
It's a different way of doing it, and it's fine to have a macro.
Reviewed-by: Javier González <javier@cnexlabs.com>
[-- Attachment #2: Message signed with OpenPGP --]
[-- Type: application/pgp-signature, Size: 801 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 5/6] lightnvm: pblk: print incompatible line version correctly
2017-09-22 9:01 ` Javier González
@ 2017-09-25 10:15 ` Matias Bjørling
0 siblings, 0 replies; 3+ messages in thread
From: Matias Bjørling @ 2017-09-25 10:15 UTC (permalink / raw)
To: Javier González, Rakesh Pandit; +Cc: linux-block, linux-kernel
On 09/22/2017 11:01 AM, Javier González wrote:
>> On 21 Sep 2017, at 13.28, Rakesh Pandit <rakesh@tuxera.com> wrote:
>>
>> Correct it by coverting little endian to cpu endian and also define a
>> macro for line version so that maintenance is easy.
>>
>> Signed-off-by: Rakesh Pandit <rakesh@tuxera.com>
>> ---
>> drivers/lightnvm/pblk-core.c | 2 +-
>> drivers/lightnvm/pblk-recovery.c | 4 ++--
>> drivers/lightnvm/pblk.h | 1 +
>> 3 files changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c
>> index 74ddb30..57583a1 100644
>> --- a/drivers/lightnvm/pblk-core.c
>> +++ b/drivers/lightnvm/pblk-core.c
>> @@ -991,7 +991,7 @@ static int pblk_line_init_metadata(struct pblk *pblk, struct pblk_line *line,
>> memcpy(smeta_buf->header.uuid, pblk->instance_uuid, 16);
>> smeta_buf->header.id = cpu_to_le32(line->id);
>> smeta_buf->header.type = cpu_to_le16(line->type);
>> - smeta_buf->header.version = cpu_to_le16(1);
>> + smeta_buf->header.version = SMETA_VERSION;
>>
>> /* Start metadata */
>> smeta_buf->seq_nr = cpu_to_le64(line->seq_nr);
>> diff --git a/drivers/lightnvm/pblk-recovery.c b/drivers/lightnvm/pblk-recovery.c
>> index 1869eef..686bc17 100644
>> --- a/drivers/lightnvm/pblk-recovery.c
>> +++ b/drivers/lightnvm/pblk-recovery.c
>> @@ -876,9 +876,9 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk)
>> if (le32_to_cpu(smeta_buf->header.identifier) != PBLK_MAGIC)
>> continue;
>>
>> - if (le16_to_cpu(smeta_buf->header.version) != 1) {
>> + if (smeta_buf->header.version != SMETA_VERSION) {
>> pr_err("pblk: found incompatible line version %u\n",
>> - smeta_buf->header.version);
>> + le16_to_cpu(smeta_buf->header.version));
>> return ERR_PTR(-EINVAL);
>> }
>>
>> diff --git a/drivers/lightnvm/pblk.h b/drivers/lightnvm/pblk.h
>> index eaf5397..87b1d7f 100644
>> --- a/drivers/lightnvm/pblk.h
>> +++ b/drivers/lightnvm/pblk.h
>> @@ -318,6 +318,7 @@ enum {
>> };
>>
>> #define PBLK_MAGIC 0x70626c6b /*pblk*/
>> +#define SMETA_VERSION cpu_to_le16(1)
>>
>> struct line_header {
>> __le32 crc;
>> --
>> 2.5.0
>
> It's a different way of doing it, and it's fine to have a macro.
>
> Reviewed-by: Javier González <javier@cnexlabs.com>
>
Thanks, I picked it up.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-09-25 10:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-21 11:28 [PATCH 5/6] lightnvm: pblk: print incompatible line version correctly Rakesh Pandit
2017-09-22 9:01 ` Javier González
2017-09-25 10:15 ` Matias Bjørling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).