From a4de4268bdab3fb20f0d1c0617836528eca0ef1e Mon Sep 17 00:00:00 2001 From: le Date: Mon, 13 Sep 2004 17:44:47 +0000 Subject: Rename gv_kill_thread() to gv_kill_plex_thread(), since there are more threads to come. --- sys/geom/vinum/geom_vinum.h | 2 +- sys/geom/vinum/geom_vinum_plex.c | 4 ++-- sys/geom/vinum/geom_vinum_rm.c | 2 +- sys/geom/vinum/geom_vinum_subr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sys/geom/vinum') diff --git a/sys/geom/vinum/geom_vinum.h b/sys/geom/vinum/geom_vinum.h index 23c15b2..376f17c 100644 --- a/sys/geom/vinum/geom_vinum.h +++ b/sys/geom/vinum/geom_vinum.h @@ -68,7 +68,7 @@ struct gv_volume *gv_find_vol(struct gv_softc *, char *); void gv_format_config(struct gv_softc *, struct sbuf *, int, char *); int gv_is_striped(struct gv_plex *); int gv_is_open(struct g_geom *); -void gv_kill_thread(struct gv_plex *); +void gv_kill_plex_thread(struct gv_plex *); int gv_object_type(struct gv_softc *, char *); void gv_parse_config(struct gv_softc *, u_char *, int); const char *gv_roughlength(off_t, int); diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c index 448f55e..8cfa6be 100644 --- a/sys/geom/vinum/geom_vinum_plex.c +++ b/sys/geom/vinum/geom_vinum_plex.c @@ -67,7 +67,7 @@ gv_plex_orphan(struct g_consumer *cp) p = gp->softc; if (p != NULL) { - gv_kill_thread(p); + gv_kill_plex_thread(p); p->geom = NULL; p->provider = NULL; p->consumer = NULL; @@ -468,7 +468,7 @@ gv_plex_destroy_geom(struct gctl_req *req, struct g_class *mp, * If this is a RAID5 plex, check if its worker thread is still active * and signal it to self destruct. */ - gv_kill_thread(p); + gv_kill_plex_thread(p); /* g_free(sc); */ g_wither_geom(gp, ENXIO); return (0); diff --git a/sys/geom/vinum/geom_vinum_rm.c b/sys/geom/vinum/geom_vinum_rm.c index 4df26c9..9373dd8 100644 --- a/sys/geom/vinum/geom_vinum_rm.c +++ b/sys/geom/vinum/geom_vinum_rm.c @@ -228,7 +228,7 @@ gv_rm_plex(struct gv_softc *sc, struct gctl_req *req, struct gv_plex *p, int fla p->vol_sc = NULL; } - gv_kill_thread(p); + gv_kill_plex_thread(p); g_free(p); if (gp != NULL) { diff --git a/sys/geom/vinum/geom_vinum_subr.c b/sys/geom/vinum/geom_vinum_subr.c index 7326210..fe1da8b 100644 --- a/sys/geom/vinum/geom_vinum_subr.c +++ b/sys/geom/vinum/geom_vinum_subr.c @@ -817,7 +817,7 @@ gv_object_type(struct gv_softc *sc, char *name) } void -gv_kill_thread(struct gv_plex *p) +gv_kill_plex_thread(struct gv_plex *p) { if ((p->org == GV_PLEX_RAID5) && (p->flags & GV_PLEX_THREAD_ACTIVE)) { p->flags |= GV_PLEX_THREAD_DIE; -- cgit v1.1