Module Name: src
Committed By: drochner
Date: Fri Apr 27 18:15:55 UTC 2012
Modified Files:
src/sys/dev/dkwedge: dk.c
src/sys/kern: subr_disk_open.c
Log Message:
minor mostly cosmetical fixes: use designated type for device major
numbers, typo in comment, misuse of minor()
(the latter one is not cosmetical, but would only affect systems
with more than 256 disk wedges)
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/dkwedge/dk.c
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/subr_disk_open.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.62 src/sys/dev/dkwedge/dk.c:1.63
--- src/sys/dev/dkwedge/dk.c:1.62 Sat Jul 30 12:08:36 2011
+++ src/sys/dev/dkwedge/dk.c Fri Apr 27 18:15:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dk.c,v 1.62 2011/07/30 12:08:36 jmcneill Exp $ */
+/* $NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $ */
/*-
* Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.62 2011/07/30 12:08:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.63 2012/04/27 18:15:55 drochner Exp $");
#ifdef _KERNEL_OPT
#include "opt_dkwedge.h"
@@ -183,7 +183,8 @@ static int
dkwedge_compute_pdev(const char *pname, dev_t *pdevp)
{
const char *name, *cp;
- int punit, pmaj;
+ devmajor_t pmaj;
+ int punit;
char devname[16];
name = pname;
@@ -320,7 +321,7 @@ dkwedge_add(struct dkwedge_info *dkw)
if (sc->sc_offset >= lsc->sc_offset &&
sc->sc_offset <= llastblk) {
- /* Overlaps the tail of the exsiting wedge. */
+ /* Overlaps the tail of the existing wedge. */
break;
}
if (lastblk >= lsc->sc_offset &&
Index: src/sys/kern/subr_disk_open.c
diff -u src/sys/kern/subr_disk_open.c:1.7 src/sys/kern/subr_disk_open.c:1.8
--- src/sys/kern/subr_disk_open.c:1.7 Sat Apr 7 05:38:07 2012
+++ src/sys/kern/subr_disk_open.c Fri Apr 27 18:15:55 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_open.c,v 1.7 2012/04/07 05:38:07 christos Exp $ */
+/* $NetBSD: subr_disk_open.c,v 1.8 2012/04/27 18:15:55 drochner Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.7 2012/04/07 05:38:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_open.c,v 1.8 2012/04/27 18:15:55 drochner Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -42,7 +42,8 @@ __KERNEL_RCSID(0, "$NetBSD: subr_disk_op
struct vnode *
opendisk(struct device *dv)
{
- int bmajor, bminor;
+ devmajor_t bmajor;
+ int unit;
struct vnode *tmpvn;
int error;
dev_t dev;
@@ -54,13 +55,13 @@ opendisk(struct device *dv)
if (bmajor == -1)
return NULL;
- bminor = minor(device_unit(dv));
+ unit = device_unit(dv);
/*
* Fake a temporary vnode for the disk, open it, and read
* and hash the sectors.
*/
- dev = device_is_a(dv, "dk") ? makedev(bmajor, bminor) :
- MAKEDISKDEV(bmajor, bminor, RAW_PART);
+ dev = device_is_a(dv, "dk") ? makedev(bmajor, unit) :
+ MAKEDISKDEV(bmajor, unit, RAW_PART);
if (bdevvp(dev, &tmpvn))
panic("%s: can't alloc vnode for %s", __func__,
device_xname(dv));
