Module Name: src
Committed By: thorpej
Date: Sun Jan 26 21:43:52 UTC 2020
Modified Files:
src/sys/dev/ofw: ofdisk.c
Log Message:
Fix __HAVE_OLD_DISKLABEL bits so they at least compile.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/ofw/ofdisk.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/ofw/ofdisk.c
diff -u src/sys/dev/ofw/ofdisk.c:1.53 src/sys/dev/ofw/ofdisk.c:1.54
--- src/sys/dev/ofw/ofdisk.c:1.53 Wed Mar 27 19:13:34 2019
+++ src/sys/dev/ofw/ofdisk.c Sun Jan 26 21:43:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofdisk.c,v 1.53 2019/03/27 19:13:34 martin Exp $ */
+/* $NetBSD: ofdisk.c,v 1.54 2020/01/26 21:43:52 thorpej Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.53 2019/03/27 19:13:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofdisk.c,v 1.54 2020/01/26 21:43:52 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -404,11 +404,11 @@ ofdisk_ioctl(dev_t dev, u_long cmd, void
error = setdisklabel(of->sc_dk.dk_label,
lp, /*of->sc_dk.dk_openmask */0,
of->sc_dk.dk_cpulabel);
- if (error == 0 && cmd == DIOCWDINFO
+ if (error == 0 && (cmd == DIOCWDINFO
#ifdef __HAVE_OLD_DISKLABEL
- || xfer == ODIOCWDINFO
+ || cmd == ODIOCWDINFO
#endif
- )
+ ))
error = writedisklabel(MAKEDISKDEV(major(dev),
DISKUNIT(dev), RAW_PART), ofdisk_strategy,
of->sc_dk.dk_label, of->sc_dk.dk_cpulabel);
@@ -422,7 +422,7 @@ ofdisk_ioctl(dev_t dev, u_long cmd, void
ofdisk_getdefaultlabel(of, (struct disklabel *)data);
return 0;
#ifdef __HAVE_OLD_DISKLABEL
- case DIOCGDEFLABEL:
+ case ODIOCGDEFLABEL:
ofdisk_getdefaultlabel(of, &newlabel);
if (newlabel.d_npartitions > OLDMAXPARTITIONS)
return ENOTTY;
