Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c79819bc authored by Rakesh Pandit's avatar Rakesh Pandit Committed by Jens Axboe
Browse files

lightnvm: pblk: print incompatible line version correctly 



Correct it by converting little endian to cpu endian and also define
a macro for line version so that maintenance is easy.

Signed-off-by: default avatarRakesh Pandit <rakesh@tuxera.com>
Reviewed-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent c5493845

drivers/lightnvm/pblk-core.c

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,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);

drivers/lightnvm/pblk-recovery.c

+2 −2
Original line number Diff line number Diff line
@@ -900,9 +900,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);

		}

drivers/lightnvm/pblk.h

+1 −0
Original line number Diff line number Diff line
@@ -310,6 +310,7 @@ enum { 
};



#define PBLK_MAGIC 0x70626c6b /*pblk*/

#define SMETA_VERSION cpu_to_le16(1)



struct line_header {

	__le32 crc;