Module Name: src
Committed By: christos
Date: Wed May 29 23:25:55 UTC 2013
Modified Files:
src/sys/dev: dksubr.c dkvar.h
Log Message:
eliminate dk_geom
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/dksubr.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/dkvar.h
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/dksubr.c
diff -u src/sys/dev/dksubr.c:1.46 src/sys/dev/dksubr.c:1.47
--- src/sys/dev/dksubr.c:1.46 Tue May 28 20:47:48 2013
+++ src/sys/dev/dksubr.c Wed May 29 19:25:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dksubr.c,v 1.46 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: dksubr.c,v 1.47 2013/05/29 23:25:55 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.46 2013/05/29 00:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dksubr.c,v 1.47 2013/05/29 23:25:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -340,12 +340,12 @@ dk_ioctl(struct dk_intf *di, struct dk_s
switch (cmd) {
#ifdef DIOCGSECTORSIZE
case DIOCGSECTORSIZE:
- *(u_int *)data = dksc->sc_geom.pdg_secsize;
+ *(u_int *)data = dksc->sc_dkdev.dk_geom.dg_secsize;
return 0;
case DIOCGMEDIASIZE:
*(off_t *)data =
- (off_t)dksc->sc_geom.pdg_secsize *
- dksc->sc_geom.pdg_nsectors;
+ (off_t)dksc->sc_dkdev.dk_geom.dg_secsize *
+ dksc->sc_dkdev.dk_geom.dg_nsectors;
return 0;
#endif
@@ -548,15 +548,15 @@ void
dk_getdefaultlabel(struct dk_intf *di, struct dk_softc *dksc,
struct disklabel *lp)
{
- struct dk_geom *pdg = &dksc->sc_geom;
+ struct disk_geom *dg = &dksc->sc_dkdev.dk_geom;
memset(lp, 0, sizeof(*lp));
- lp->d_secperunit = dksc->sc_size;
- lp->d_secsize = pdg->pdg_secsize;
- lp->d_nsectors = pdg->pdg_nsectors;
- lp->d_ntracks = pdg->pdg_ntracks;
- lp->d_ncylinders = pdg->pdg_ncylinders;
+ lp->d_secperunit = dg->dg_secperunit;
+ lp->d_secsize = dg->dg_secsize;
+ lp->d_nsectors = dg->dg_nsectors;
+ lp->d_ntracks = dg->dg_ntracks;
+ lp->d_ncylinders = dg->dg_ncylinders;
lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
strncpy(lp->d_typename, di->di_dkname, sizeof(lp->d_typename));
@@ -626,23 +626,6 @@ dk_makedisklabel(struct dk_intf *di, str
lp->d_checksum = dkcksum(lp);
}
-void
-dk_set_geometry(struct dk_intf *di, struct dk_softc *dksc)
-{
- struct disk_geom *dg = &dksc->sc_dkdev.dk_geom;
-
- memset(dg, 0, sizeof(*dg));
-
- dg->dg_secperunit = dksc->sc_size;
- dg->dg_secsize = dksc->sc_geom.pdg_secsize;
- dg->dg_nsectors = dksc->sc_geom.pdg_nsectors;
- dg->dg_ntracks = dksc->sc_geom.pdg_ntracks;
- dg->dg_ncylinders = dksc->sc_geom.pdg_ncylinders;
-
- disk_set_info(dksc->sc_dev, &dksc->sc_dkdev, NULL);
-
-}
-
/* This function is taken from ccd.c:1.76 --rcd */
/*
Index: src/sys/dev/dkvar.h
diff -u src/sys/dev/dkvar.h:1.17 src/sys/dev/dkvar.h:1.18
--- src/sys/dev/dkvar.h:1.17 Tue May 28 20:47:48 2013
+++ src/sys/dev/dkvar.h Wed May 29 19:25:55 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dkvar.h,v 1.17 2013/05/29 00:47:48 christos Exp $ */
+/* $NetBSD: dkvar.h,v 1.18 2013/05/29 23:25:55 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,14 +32,6 @@
struct pathbuf; /* from namei.h */
-/* XXX: GC */
-struct dk_geom {
- u_int32_t pdg_secsize;
- u_int32_t pdg_nsectors;
- u_int32_t pdg_ntracks;
- u_int32_t pdg_ncylinders;
-};
-
/* literally this is not a softc, but is intended to be included in
* the pseudo-disk's softc and passed to calls in dksubr.c. It
* should include the common elements of the pseudo-disk's softc.
@@ -50,8 +42,6 @@ struct dk_geom {
struct dk_softc {
device_t sc_dev;
u_int32_t sc_flags; /* flags */
- size_t sc_size; /* size of disk */
- struct dk_geom sc_geom; /* geometry info */
#define DK_XNAME_SIZE 8
char sc_xname[DK_XNAME_SIZE]; /* external name */
struct disk sc_dkdev; /* generic disk info */
@@ -113,7 +103,5 @@ int dk_dump(struct dk_intf *, struct dk_
void dk_getdisklabel(struct dk_intf *, struct dk_softc *, dev_t);
void dk_getdefaultlabel(struct dk_intf *, struct dk_softc *,
struct disklabel *);
-/* XXX: GC use disk_set_info() */
-void dk_set_geometry(struct dk_intf *, struct dk_softc *);
int dk_lookup(struct pathbuf *, struct lwp *, struct vnode **);
