Module Name: src
Committed By: riz
Date: Thu Jul 12 18:32:05 UTC 2012
Modified Files:
src/sys/dev/mscp [netbsd-6]: mscp_disk.c
Log Message:
Pull up following revision(s) (requested by abs in ticket #412):
sys/dev/mscp/mscp_disk.c: revision 1.75
- Unconditionally initialise tp to avoid a warning
- Use DK_CLOSED rather than CLOSED (no functional change)
To generate a diff of this commit:
cvs rdiff -u -r1.71.18.1 -r1.71.18.2 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.71.18.1 src/sys/dev/mscp/mscp_disk.c:1.71.18.2
--- src/sys/dev/mscp/mscp_disk.c:1.71.18.1 Wed Jul 4 20:41:46 2012
+++ src/sys/dev/mscp/mscp_disk.c Thu Jul 12 18:32:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $ */
+/* $NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -82,7 +82,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.1 2012/07/04 20:41:46 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mscp_disk.c,v 1.71.18.2 2012/07/12 18:32:05 riz Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -305,7 +305,7 @@ raclose(dev_t dev, int flags, int fmt, s
(void) tsleep(&udautab[unit], PZERO - 1,
"raclose", 0);
splx(s);
- ra->ra_state = CLOSED;
+ ra->ra_state = DK_CLOSED;
ra->ra_wlabel = 0;
}
#endif
@@ -461,9 +461,8 @@ raioctl(dev_t dev, u_long cmd, void *dat
if (cmd == ODIOCGDEFLABEL)
tp = &newlabel;
else
-#else
- tp = (struct disklabel *)data;
#endif
+ tp = (struct disklabel *)data;
memset(tp, 0, sizeof(struct disklabel));
tp->d_secsize = lp->d_secsize;
tp->d_nsectors = lp->d_nsectors;
@@ -523,7 +522,6 @@ raioctl(dev_t dev, u_long cmd, void *dat
return (error);
}
-
int
radump(dev_t dev, daddr_t blkno, void *va, size_t size)
{
