From cf33008f77f45f702d505c68cd3bc82012fd47e7 Mon Sep 17 00:00:00 2001 From: pjd Date: Wed, 1 Nov 2006 22:16:53 +0000 Subject: Change spaces to tabs where needed. --- sys/geom/journal/g_journal.c | 2 +- sys/geom/raid3/g_raid3.c | 40 ++++++++++++++++++++-------------------- sys/geom/raid3/g_raid3_ctl.c | 8 ++++---- sys/geom/stripe/g_stripe.c | 6 +++--- 4 files changed, 28 insertions(+), 28 deletions(-) (limited to 'sys/geom') diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 80aa44e..15aae95 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -2905,7 +2905,7 @@ g_journal_do_switch(struct g_class *classp, struct thread *td) error = vn_start_write(NULL, &mp, V_WAIT); if (error != 0) { - VFS_UNLOCK_GIANT(vfslocked); + VFS_UNLOCK_GIANT(vfslocked); GJ_DEBUG(0, "vn_start_write(%s) failed (error=%d).", mountpoint, error); goto next; diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 3cb1c6c..e08e331 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -1513,8 +1513,8 @@ static void g_raid3_regular_delay(struct g_raid3_softc *sc, struct bio *bp) { - G_RAID3_LOGREQ(2, bp, "Delaying request."); - bioq_insert_head(&sc->sc_regular_delayed, bp); + G_RAID3_LOGREQ(2, bp, "Delaying request."); + bioq_insert_head(&sc->sc_regular_delayed, bp); } /* @@ -1524,8 +1524,8 @@ static void g_raid3_sync_delay(struct g_raid3_softc *sc, struct bio *bp) { - G_RAID3_LOGREQ(2, bp, "Delaying synchronization request."); - bioq_insert_tail(&sc->sc_sync_delayed, bp); + G_RAID3_LOGREQ(2, bp, "Delaying synchronization request."); + bioq_insert_tail(&sc->sc_sync_delayed, bp); } /* @@ -1535,13 +1535,13 @@ g_raid3_sync_delay(struct g_raid3_softc *sc, struct bio *bp) static void g_raid3_regular_release(struct g_raid3_softc *sc) { - struct bio *bp, *bp2; + struct bio *bp, *bp2; - TAILQ_FOREACH_SAFE(bp, &sc->sc_regular_delayed.queue, bio_queue, bp2) { - if (g_raid3_sync_collision(sc, bp)) - continue; - bioq_remove(&sc->sc_regular_delayed, bp); - G_RAID3_LOGREQ(2, bp, "Releasing delayed request (%p).", bp); + TAILQ_FOREACH_SAFE(bp, &sc->sc_regular_delayed.queue, bio_queue, bp2) { + if (g_raid3_sync_collision(sc, bp)) + continue; + bioq_remove(&sc->sc_regular_delayed, bp); + G_RAID3_LOGREQ(2, bp, "Releasing delayed request (%p).", bp); mtx_lock(&sc->sc_queue_mtx); bioq_insert_head(&sc->sc_queue, bp); #if 0 @@ -1552,7 +1552,7 @@ g_raid3_regular_release(struct g_raid3_softc *sc) wakeup(&sc->sc_queue); #endif mtx_unlock(&sc->sc_queue_mtx); - } + } } /* @@ -1562,16 +1562,16 @@ g_raid3_regular_release(struct g_raid3_softc *sc) static void g_raid3_sync_release(struct g_raid3_softc *sc) { - struct bio *bp, *bp2; + struct bio *bp, *bp2; - TAILQ_FOREACH_SAFE(bp, &sc->sc_sync_delayed.queue, bio_queue, bp2) { - if (g_raid3_regular_collision(sc, bp)) - continue; - bioq_remove(&sc->sc_sync_delayed, bp); - G_RAID3_LOGREQ(2, bp, - "Releasing delayed synchronization request."); - g_io_request(bp, bp->bio_from); - } + TAILQ_FOREACH_SAFE(bp, &sc->sc_sync_delayed.queue, bio_queue, bp2) { + if (g_raid3_regular_collision(sc, bp)) + continue; + bioq_remove(&sc->sc_sync_delayed, bp); + G_RAID3_LOGREQ(2, bp, + "Releasing delayed synchronization request."); + g_io_request(bp, bp->bio_from); + } } /* diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c index 7847e29..67d1f44 100644 --- a/sys/geom/raid3/g_raid3_ctl.c +++ b/sys/geom/raid3/g_raid3_ctl.c @@ -471,11 +471,11 @@ g_raid3_ctl_insert(struct gctl_req *req, struct g_class *mp) g_raid3_fill_metadata(disk, &md); sx_xunlock(&sc->sc_lock); md.md_syncid = 0; - md.md_dflags = 0; + md.md_dflags = 0; if (*hardcode) - strlcpy(md.md_provider, pp->name, sizeof(md.md_provider)); - else - bzero(md.md_provider, sizeof(md.md_provider)); + strlcpy(md.md_provider, pp->name, sizeof(md.md_provider)); + else + bzero(md.md_provider, sizeof(md.md_provider)); md.md_provsize = pp->mediasize; sector = g_malloc(pp->sectorsize, M_WAITOK); raid3_metadata_encode(&md, sector); diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index 8f8de35..3bf087f 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -579,9 +579,9 @@ g_stripe_start(struct bio *bp) case BIO_WRITE: case BIO_DELETE: break; - case BIO_FLUSH: - g_stripe_flush(sc, bp); - return; + case BIO_FLUSH: + g_stripe_flush(sc, bp); + return; case BIO_GETATTR: /* To which provider it should be delivered? */ default: -- cgit v1.1