Module Name: src
Committed By: kamil
Date: Thu Nov 7 18:35:41 UTC 2019
Modified Files:
src/sys/kern: subr_disk_mbr.c
Log Message:
Revert src/sys/kern/subr_disk_mbr.c r.1.52
Addressed in a better way in r. 1.53.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/kern/subr_disk_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.53 src/sys/kern/subr_disk_mbr.c:1.54
--- src/sys/kern/subr_disk_mbr.c:1.53 Thu Nov 7 18:30:27 2019
+++ src/sys/kern/subr_disk_mbr.c Thu Nov 7 18:35:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.53 2019/11/07 18:30:27 kamil Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.54 2019/11/07 18:35:41 kamil Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.53 2019/11/07 18:30:27 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.54 2019/11/07 18:35:41 kamil Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -571,11 +571,8 @@ look_netbsd_part(mbr_args_t *a, mbr_part
static bool
check_label_magic(const struct disklabel *dlp, uint32_t diskmagic)
{
-
- return memcmp((const char *)dlp + offsetof(struct disklabel, d_magic),
- &diskmagic, sizeof(diskmagic)) == 0 &&
- memcmp((const char *)dlp + offsetof(struct disklabel, d_magic2),
- &diskmagic, sizeof(diskmagic)) == 0;
+ return memcmp(&dlp->d_magic, &diskmagic, sizeof(diskmagic)) == 0 &&
+ memcmp(&dlp->d_magic2, &diskmagic, sizeof(diskmagic)) == 0;
}
#ifdef DISKLABEL_EI
