diff options
| author | Jamie Gritton <jamie@FreeBSD.org> | 2009-05-29 21:27:12 +0000 |
|---|---|---|
| committer | Jamie Gritton <jamie@FreeBSD.org> | 2009-05-29 21:27:12 +0000 |
| commit | 76ca6f88dab430fe415094fb54beb7eaa010d22e (patch) | |
| tree | 36c53629863ffb1eb32354e9a24549059dd6273f /sys/geom | |
| parent | 88812d9e1dfe430d3387fb39f958373f40b079f2 (diff) | |
Notes
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/vinum/geom_vinum_create.c | 6 | ||||
| -rw-r--r-- | sys/geom/vinum/geom_vinum_drive.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/geom/vinum/geom_vinum_create.c b/sys/geom/vinum/geom_vinum_create.c index 3f8212cffb321..0ea0ef308bb6c 100644 --- a/sys/geom/vinum/geom_vinum_create.c +++ b/sys/geom/vinum/geom_vinum_create.c @@ -31,10 +31,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/bio.h> #include <sys/conf.h> +#include <sys/jail.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <geom/geom.h> #include <geom/vinum/geom_vinum_var.h> @@ -157,9 +157,7 @@ gv_create_drive(struct gv_softc *sc, struct gv_drive *d) hdr = g_malloc(sizeof(*hdr), M_WAITOK | M_ZERO); hdr->magic = GV_MAGIC; hdr->config_length = GV_CFG_LEN; - mtx_lock(&hostname_mtx); - bcopy(G_hostname, hdr->label.sysname, GV_HOSTNAME_LEN); - mtx_unlock(&hostname_mtx); + getcredhostname(NULL, hdr->label.sysname, GV_HOSTNAME_LEN); strlcpy(hdr->label.name, d->name, sizeof(hdr->label.name)); microtime(&hdr->label.date_of_birth); d->hdr = hdr; diff --git a/sys/geom/vinum/geom_vinum_drive.c b/sys/geom/vinum/geom_vinum_drive.c index 1e9dd0b12efc0..5ab68f39dd738 100644 --- a/sys/geom/vinum/geom_vinum_drive.c +++ b/sys/geom/vinum/geom_vinum_drive.c @@ -30,7 +30,6 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <sys/malloc.h> #include <sys/systm.h> -#include <sys/vimage.h> #include <geom/geom.h> #include <geom/vinum/geom_vinum_var.h> |