Commit f4b64ae6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jens Axboe
Browse files

lightnvm: pblk: Replace guid_copy() with export_guid()/import_guid() 



There is a specific API to treat raw data as GUID, i.e. export_guid()
and import_guid(). Use them instead of guid_copy() with explicit casting.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMatias Bjørling <matias.bjorling@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 4cf29e43

drivers/lightnvm/pblk-core.c

+2 −3
Original line number Diff line number Diff line
@@ -988,7 +988,7 @@ static int pblk_line_init_metadata(struct pblk *pblk, struct pblk_line *line, 
	bitmap_set(line->lun_bitmap, 0, lm->lun_bitmap_len);



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

	guid_copy((guid_t *)&smeta_buf->header.uuid, &pblk->instance_uuid);

	export_guid(smeta_buf->header.uuid, &pblk->instance_uuid);

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

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

	smeta_buf->header.version_major = SMETA_VERSION_MAJOR;
@@ -1803,8 +1803,7 @@ void pblk_line_close_meta(struct pblk *pblk, struct pblk_line *line) 


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

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

		guid_copy((guid_t *)&emeta_buf->header.uuid,

							&pblk->instance_uuid);

		export_guid(emeta_buf->header.uuid, &pblk->instance_uuid);

		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;

drivers/lightnvm/pblk-recovery.c

+1 −2
Original line number Diff line number Diff line
@@ -706,8 +706,7 @@ struct pblk_line *pblk_recov_l2p(struct pblk *pblk) 


		/* The first valid instance uuid is used for initialization */

		if (!valid_uuid) {

			guid_copy(&pblk->instance_uuid,

				  (guid_t *)&smeta_buf->header.uuid);

			import_guid(&pblk->instance_uuid, smeta_buf->header.uuid);

			valid_uuid = 1;

		}