diff options
author | phk <phk@FreeBSD.org> | 2004-02-12 22:42:11 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2004-02-12 22:42:11 +0000 |
commit | 124977fbb6c505edf20e1c4b862194c84d39f1eb (patch) | |
tree | b700329baa11c7dbd187df0ad4e8480d842ec8fa /sys/geom/geom_fox.c | |
parent | e929b29355b485b504986972ea051a80ca2254e7 (diff) | |
download | FreeBSD-src-124977fbb6c505edf20e1c4b862194c84d39f1eb.zip FreeBSD-src-124977fbb6c505edf20e1c4b862194c84d39f1eb.tar.gz |
Remove the absolute count g_access_abs() function since experience has
shown that it is not useful.
Rename the relative count g_access_rel() function to g_access(), only
the name has changed.
Change all g_access_rel() calls in our CVS tree to call g_access() instead.
Add an #ifndef BURN_BRIDGES #define of g_access_rel() for source
code compatibility.
Diffstat (limited to 'sys/geom/geom_fox.c')
-rw-r--r-- | sys/geom/geom_fox.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sys/geom/geom_fox.c b/sys/geom/geom_fox.c index df4b68c..2c4b3d0 100644 --- a/sys/geom/geom_fox.c +++ b/sys/geom/geom_fox.c @@ -90,13 +90,13 @@ g_fox_select_path(void *arg, int flag) cp1 = LIST_NEXT(sc->opath, consumer); - error = g_access_rel(sc->opath, -sc->cr, -sc->cw, -(sc->ce + 1)); + error = g_access(sc->opath, -sc->cr, -sc->cw, -(sc->ce + 1)); KASSERT(error == 0, ("Failed close of old path %d", error)); /* * The attempt to reopen it with a exclusive count */ - error = g_access_rel(sc->opath, 0, 0, 1); + error = g_access(sc->opath, 0, 0, 1); if (error) { /* * Ok, ditch this consumer, we can't use it. @@ -130,7 +130,7 @@ g_fox_select_path(void *arg, int flag) cp1 = LIST_FIRST(&gp->consumer); printf("Open new path (%s) on fox (%s)\n", cp1->provider->name, gp->name); - error = g_access_rel(cp1, sc->cr, sc->cw, sc->ce); + error = g_access(cp1, sc->cr, sc->cw, sc->ce); if (error) { /* * If we failed, we take another trip through here @@ -179,7 +179,7 @@ g_fox_orphan(struct g_consumer *cp) } mtx_unlock(&sc->lock); - g_access_rel(cp, -cp->acr, -cp->acw, -cp->ace); + g_access(cp, -cp->acr, -cp->acw, -cp->ace); error = cp->provider->error; g_detach(cp); g_destroy_consumer(cp); @@ -299,7 +299,7 @@ g_fox_access(struct g_provider *pp, int dr, int dw, int de) */ error = 0; LIST_FOREACH(cp1, &gp->consumer, consumer) { - error = g_access_rel(cp1, 0, 0, 1); + error = g_access(cp1, 0, 0, 1); if (error) { printf("FOX: access(%s,0,0,1) = %d\n", cp1->provider->name, error); @@ -309,7 +309,7 @@ g_fox_access(struct g_provider *pp, int dr, int dw, int de) if (error) { LIST_FOREACH(cp1, &gp->consumer, consumer) { if (cp1->ace) - g_access_rel(cp1, 0, 0, -1); + g_access(cp1, 0, 0, -1); } return (error); } @@ -319,7 +319,7 @@ g_fox_access(struct g_provider *pp, int dr, int dw, int de) if (sc->path == NULL) error = ENXIO; else - error = g_access_rel(sc->path, dr, dw, de); + error = g_access(sc->path, dr, dw, de); if (error == 0) { sc->cr += dr; sc->cw += dw; @@ -329,7 +329,7 @@ g_fox_access(struct g_provider *pp, int dr, int dw, int de) * Last close, remove e-bit on all consumers */ LIST_FOREACH(cp1, &gp->consumer, consumer) - g_access_rel(cp1, 0, 0, -1); + g_access(cp1, 0, 0, -1); } } return (error); @@ -360,7 +360,7 @@ g_fox_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) gp->access= g_fox_access; cp = g_new_consumer(gp); g_attach(cp, pp); - error = g_access_rel(cp, 1, 0, 0); + error = g_access(cp, 1, 0, 0); if (error) { g_free(sc); g_detach(cp); @@ -401,7 +401,7 @@ g_fox_taste(struct g_class *mp, struct g_provider *pp, int flags __unused) g_attach(cp2, pp); pp2 = LIST_FIRST(&gp2->provider); if (pp2->acr > 0 || pp2->acw > 0 || pp2->ace > 0) { - error = g_access_rel(cp2, 0, 0, 1); + error = g_access(cp2, 0, 0, 1); if (error) { /* * This is bad, or more likely, @@ -433,7 +433,7 @@ printf("fox %s lock %p\n", gp->name, &sc->lock); } while (0); if (buf != NULL) g_free(buf); - g_access_rel(cp, -1, 0, 0); + g_access(cp, -1, 0, 0); if (!LIST_EMPTY(&gp->provider)) return (gp); |