D53842.id.diff
No OneTemporary
Actions

Size

643 B

Referenced Files

None

Subscribers

None

D53842.id.diff
View Options

	diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
	--- a/sys/dev/nvme/nvme.h
	+++ b/sys/dev/nvme/nvme.h
	@@ -29,10 +29,6 @@
	#ifndef __NVME_H__
	#define __NVME_H__

	-#ifdef _KERNEL
	-#include <sys/types.h>
	-#endif
	-
	#include <sys/param.h>
	#include <sys/endian.h>
	#ifndef _KERNEL
	@@ -2010,7 +2006,7 @@
	_Static_assert(NVME_SERIAL_NUMBER_LENGTH < DISK_IDENT_SIZE,
	"NVME serial number too big for disk ident");

	- memmove(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH);
	+ memcpy(sn, cdata->sn, NVME_SERIAL_NUMBER_LENGTH);
	sn[NVME_SERIAL_NUMBER_LENGTH] = '\0';
	for (int i = 0; sn[i] != '\0'; i++) {
	if (sn[i] < 0x20 \|\| sn[i] >= 0x80)