diff options
author | Lukas Ertl <le@FreeBSD.org> | 2004-08-27 21:32:18 +0000 |
---|---|---|
committer | Lukas Ertl <le@FreeBSD.org> | 2004-08-27 21:32:18 +0000 |
commit | 5bad268cdccd2002e97241a87bb184749eb22cc8 (patch) | |
tree | 3bb475733d4e0addb875ef688b8764386ef27623 /sys/geom/vinum | |
parent | 0039290c1f5936f763d378d57d7cf01b333b5ecd (diff) | |
download | src-5bad268cdccd2002e97241a87bb184749eb22cc8.tar.gz src-5bad268cdccd2002e97241a87bb184749eb22cc8.zip |
Move config_new_drive() to the correct place and rename it to
gv_config_new_drive().
Notes
Notes:
svn path=/head/; revision=134407
Diffstat (limited to 'sys/geom/vinum')
-rw-r--r-- | sys/geom/vinum/geom_vinum.c | 33 | ||||
-rw-r--r-- | sys/geom/vinum/geom_vinum.h | 1 | ||||
-rw-r--r-- | sys/geom/vinum/geom_vinum_drive.c | 28 |
3 files changed, 30 insertions, 32 deletions
diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c index 24232029331e..92b0a4b47614 100644 --- a/sys/geom/vinum/geom_vinum.c +++ b/sys/geom/vinum/geom_vinum.c @@ -50,7 +50,6 @@ SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &gv_debug, 0, #endif int gv_create(struct g_geom *, struct gctl_req *); -void config_new_drive(struct gv_drive *); static void gv_orphan(struct g_consumer *cp) @@ -262,36 +261,6 @@ gv_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) } } -/* XXX this really belongs somewhere else */ -void -config_new_drive(struct gv_drive *d) -{ - struct gv_hdr *vhdr; - struct gv_freelist *fl; - - KASSERT(d != NULL, ("config_new_drive: NULL d")); - - vhdr = g_malloc(sizeof(*vhdr), M_WAITOK | M_ZERO); - vhdr->magic = GV_MAGIC; - vhdr->config_length = GV_CFG_LEN; - - bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); - strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); - microtime(&vhdr->label.date_of_birth); - - d->hdr = vhdr; - - LIST_INIT(&d->subdisks); - LIST_INIT(&d->freelist); - - fl = g_malloc(sizeof(struct gv_freelist), M_WAITOK | M_ZERO); - fl->offset = GV_DATA_START; - fl->size = d->avail; - LIST_INSERT_HEAD(&d->freelist, fl, freelist); - d->freelist_entries = 1; - -} - /* Handle userland requests for creating new objects. */ int gv_create(struct g_geom *gp, struct gctl_req *req) @@ -336,7 +305,7 @@ gv_create(struct g_geom *gp, struct gctl_req *req) d->size = pp->mediasize - GV_DATA_START; d->avail = d->size; - config_new_drive(d); + gv_config_new_drive(d); LIST_INSERT_HEAD(&sc->drives, d, drive); } diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h index d69e10410e76..23c15b2266bd 100644 --- a/sys/geom/vinum/geom_vinum.h +++ b/sys/geom/vinum/geom_vinum.h @@ -32,6 +32,7 @@ #define ERRBUFSIZ 1024 /* geom_vinum_drive.c */ +void gv_config_new_drive(struct gv_drive *); void gv_save_config_all(struct gv_softc *); void gv_save_config(struct g_consumer *, struct gv_drive *, struct gv_softc *); diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c index 12929fbcd569..62bb6f1bc1bf 100644 --- a/sys/geom/vinum/geom_vinum_drive.c +++ b/sys/geom/vinum/geom_vinum_drive.c @@ -50,6 +50,34 @@ __FBSDID("$FreeBSD$"); void gv_drive_modify(struct gv_drive *); void +gv_config_new_drive(struct gv_drive *d) +{ + struct gv_hdr *vhdr; + struct gv_freelist *fl; + + KASSERT(d != NULL, ("config_new_drive: NULL d")); + + vhdr = g_malloc(sizeof(*vhdr), M_WAITOK | M_ZERO); + vhdr->magic = GV_MAGIC; + vhdr->config_length = GV_CFG_LEN; + + bcopy(hostname, vhdr->label.sysname, GV_HOSTNAME_LEN); + strncpy(vhdr->label.name, d->name, GV_MAXDRIVENAME); + microtime(&vhdr->label.date_of_birth); + + d->hdr = vhdr; + + LIST_INIT(&d->subdisks); + LIST_INIT(&d->freelist); + + fl = g_malloc(sizeof(struct gv_freelist), M_WAITOK | M_ZERO); + fl->offset = GV_DATA_START; + fl->size = d->avail; + LIST_INSERT_HEAD(&d->freelist, fl, freelist); + d->freelist_entries = 1; +} + +void gv_save_config_all(struct gv_softc *sc) { struct gv_drive *d; |