d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move config_new_drive() to the correct place and rename it to

Browse Source 
gv_config_new_drive().
This commit is contained in:
le 2004-08-27 21:32:18 +00:00
parent 78d5f4b4e2
commit 440914a8bb
3 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys/geom/vinum/geom_vinum.c
View File

@ -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);
}

1
sys/geom/vinum/geom_vinum.h
View File

@ -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 *);

28
sys/geom/vinum/geom_vinum_drive.c
View File

@ -49,6 +49,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)
{