g_bde.c (239790) | g_bde.c (243333) |
---|---|
1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 15 unchanged lines hidden (view full) --- 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * | 1/*- 2 * Copyright (c) 2002 Poul-Henning Kamp 3 * Copyright (c) 2002 Networks Associates Technology, Inc. 4 * All rights reserved. 5 * 6 * This software was developed for the FreeBSD Project by Poul-Henning Kamp 7 * and NAI Labs, the Security Research Division of Network Associates, Inc. 8 * under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), as part of the --- 15 unchanged lines hidden (view full) --- 24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30 * SUCH DAMAGE. 31 * |
32 * $FreeBSD: head/sys/geom/bde/g_bde.c 239790 2012-08-28 19:28:31Z ed $ | 32 * $FreeBSD: head/sys/geom/bde/g_bde.c 243333 2012-11-20 12:32:18Z jh $ |
33 * 34 */ 35 36#include <sys/param.h> 37#include <sys/bio.h> 38#include <sys/lock.h> 39#include <sys/mutex.h> 40#include <sys/malloc.h> --- 138 unchanged lines hidden (view full) --- 179 sc->sectorsize = kp->sectorsize; 180 181 TAILQ_INIT(&sc->freelist); 182 TAILQ_INIT(&sc->worklist); 183 mtx_init(&sc->worklist_mutex, "g_bde_worklist", NULL, MTX_DEF); 184 /* XXX: error check */ 185 kproc_create(g_bde_worker, gp, &sc->thread, 0, 0, 186 "g_bde %s", gp->name); | 33 * 34 */ 35 36#include <sys/param.h> 37#include <sys/bio.h> 38#include <sys/lock.h> 39#include <sys/mutex.h> 40#include <sys/malloc.h> --- 138 unchanged lines hidden (view full) --- 179 sc->sectorsize = kp->sectorsize; 180 181 TAILQ_INIT(&sc->freelist); 182 TAILQ_INIT(&sc->worklist); 183 mtx_init(&sc->worklist_mutex, "g_bde_worklist", NULL, MTX_DEF); 184 /* XXX: error check */ 185 kproc_create(g_bde_worker, gp, &sc->thread, 0, 0, 186 "g_bde %s", gp->name); |
187 pp = g_new_providerf(gp, gp->name); | 187 pp = g_new_providerf(gp, "%s", gp->name); |
188 pp->stripesize = kp->zone_cont; 189 pp->stripeoffset = 0; 190 pp->mediasize = sc->mediasize; 191 pp->sectorsize = sc->sectorsize; 192 g_error_provider(pp, 0); 193 break; 194 } while (0); 195 if (pass != NULL) --- 80 unchanged lines hidden --- | 188 pp->stripesize = kp->zone_cont; 189 pp->stripeoffset = 0; 190 pp->mediasize = sc->mediasize; 191 pp->sectorsize = sc->sectorsize; 192 g_error_provider(pp, 0); 193 break; 194 } while (0); 195 if (pass != NULL) --- 80 unchanged lines hidden --- |