[src/trunk]: src/sys/dev/mscp Make this compile on ports with __HAVE_OLD_DISK...

[tsutsui <tsutsui%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/278284493ec5
branches:  trunk
changeset: 747370:278284493ec5
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 12 18:01:50 2009 +0000

description:
Make this compile on ports with __HAVE_OLD_DISKLABEL
(though currently no such ports which have mscp).
Noticed by PR kern/41862.

diffstat:

 sys/dev/mscp/mscp_disk.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (47 lines):

diff -r ccf2732e0b89 -r 278284493ec5 sys/dev/mscp/mscp_disk.c
--- a/sys/dev/mscp/mscp_disk.c  Sat Sep 12 17:40:01 2009 +0000
+++ b/sys/dev/mscp/mscp_disk.c  Sat Sep 12 18:01:50 2009 +0000
@@ -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
                            )) {
-#endif
                                ra->ra_wlabel = 1;
                                error = writedisklabel(dev, rastrategy, lp,0);
                                ra->ra_wlabel = 0;