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

Commit d56fe8f5 authored by Javier González's avatar Javier González Committed by Greg Kroah-Hartman
Browse files

lightnvm: pblk: guarantee emeta on line close 



[ Upstream commit 9cc85bc761f83da41935cdd6edcdb7c122bc90bf ]

If a line is recovered from open chunks, the memory structures for
emeta have not necessarily been properly set on line initialization.
When closing a line, make sure that emeta is consistent so that the line
can be recovered on the fast path on next reboot.

Also, remove a couple of empty lines at the end of the function.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c7e49f73

drivers/lightnvm/pblk-core.c

+11 −2
Original line number Diff line number Diff line
@@ -1773,6 +1773,17 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line) 
	wa->pad = cpu_to_le64(atomic64_read(&pblk->pad_wa));

	wa->gc = cpu_to_le64(atomic64_read(&pblk->gc_wa));



	if (le32_to_cpu(emeta_buf->header.identifier) != PBLK_MAGIC) {

		emeta_buf->header.identifier = cpu_to_le32(PBLK_MAGIC);

		memcpy(emeta_buf->header.uuid, pblk->instance_uuid, 16);

		emeta_buf->header.id = cpu_to_le32(line->id);

		emeta_buf->header.type = cpu_to_le16(line->type);

		emeta_buf->header.version_major = EMETA_VERSION_MAJOR;

		emeta_buf->header.version_minor = EMETA_VERSION_MINOR;

		emeta_buf->header.crc = cpu_to_le32(

			pblk_calc_meta_header_crc(pblk, &emeta_buf->header));

	}



	emeta_buf->nr_valid_lbas = cpu_to_le64(line->nr_valid_lbas);

	emeta_buf->crc = cpu_to_le32(pblk_calc_emeta_crc(pblk, emeta_buf));
@@ -1790,8 +1801,6 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line) 
	spin_unlock(&l_mg->close_lock);



	pblk_line_should_sync_meta(pblk);





}



static void pblk_save_lba_list(struct pblk *pblk, struct pblk_line *line)