Module Name: src
Committed By: tsutsui
Date: Sat Sep 12 18:01:50 UTC 2009
Modified Files:
src/sys/dev/mscp: mscp_disk.c
Log Message:
Make this compile on ports with __HAVE_OLD_DISKLABEL
(though currently no such ports which have mscp).
Noticed by PR kern/41862.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/mscp/mscp_disk.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/dev/mscp/mscp_disk.c
diff -u src/sys/dev/mscp/mscp_disk.c:1.70 src/sys/dev/mscp/mscp_disk.c:1.71
--- src/sys/dev/mscp/mscp_disk.c:1.70 Tue May 12 14:37:59 2009
+++ src/sys/dev/mscp/mscp_disk.c Sat Sep 12 18:01:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.70 2009/05/12 14:37:59 cegger Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.71 2009/09/12 18:01:50 tsutsui Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.70 2009/05/12 14:37:59 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71 2009/09/12 18:01:50 tsutsui Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -428,7 +428,7 @@
break;
#ifdef __HAVE_OLD_DISKLABEL
case ODIOCGDINFO:
- memcpy(&newlabel, lp, sizeof disklabel);
+ memcpy(&newlabel, lp, sizeof newlabel);
if (newlabel.d_npartitions > OLDMAXPARTITIONS)
return ENOTTY;
memcpy(data, &newlabel, sizeof (struct olddisklabel));
@@ -446,7 +446,7 @@
#ifdef __HAVE_OLD_DISKLABEL
case ODIOCWDINFO:
case ODIOCSDINFO:
- if (cmd == ODIOCSDINFO || xfer == ODIOCWDINFO) {
+ if (cmd == ODIOCSDINFO || cmd == ODIOCWDINFO) {
memset(&newlabel, 0, sizeof newlabel);
memcpy(&newlabel, data, sizeof (struct olddisklabel));
tp = &newlabel;
@@ -462,9 +462,8 @@
if ((error == 0) && (cmd == DIOCWDINFO
#ifdef __HAVE_OLD_DISKLABEL
|| cmd == ODIOCWDINFO
-#else
- )) {
#endif
+ )) {
ra->ra_wlabel = 1;
error = writedisklabel(dev, rastrategy, lp,0);
ra->ra_wlabel = 0;
