summaryrefslogtreecommitdiffstats
path: root/sys/geom/raid3
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2006-02-01 12:06:01 +0000
committerpjd <pjd@FreeBSD.org>2006-02-01 12:06:01 +0000
commit6f074b6d64c73a3076d8f1b86873b81770b1016c (patch)
tree5311a24074072aa6884ff10ed8e3a0263fedab48 /sys/geom/raid3
parent959de6987c308c175d5250fb175fde5e82b36ac6 (diff)
downloadFreeBSD-src-6f074b6d64c73a3076d8f1b86873b81770b1016c.zip
FreeBSD-src-6f074b6d64c73a3076d8f1b86873b81770b1016c.tar.gz
Remove trailing spaces.
Diffstat (limited to 'sys/geom/raid3')
-rw-r--r--sys/geom/raid3/g_raid3.c40
-rw-r--r--sys/geom/raid3/g_raid3.h4
-rw-r--r--sys/geom/raid3/g_raid3_ctl.c2
3 files changed, 23 insertions, 23 deletions
diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c
index 6cf7fbd..d83bcec 100644
--- a/sys/geom/raid3/g_raid3.c
+++ b/sys/geom/raid3/g_raid3.c
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -595,9 +595,9 @@ g_raid3_destroy_device(struct g_raid3_softc *sc)
g_raid3_disconnect_consumer(sc, cp);
sc->sc_sync.ds_geom->softc = NULL;
g_wither_geom(sc->sc_sync.ds_geom, ENXIO);
- uma_zdestroy(sc->sc_zone_64k);
- uma_zdestroy(sc->sc_zone_16k);
- uma_zdestroy(sc->sc_zone_4k);
+ uma_zdestroy(sc->sc_zone_64k);
+ uma_zdestroy(sc->sc_zone_16k);
+ uma_zdestroy(sc->sc_zone_4k);
mtx_destroy(&sc->sc_queue_mtx);
mtx_destroy(&sc->sc_events_mtx);
G_RAID3_DEBUG(0, "Device %s destroyed.", gp->name);
@@ -818,12 +818,12 @@ g_raid3_unidle(struct g_raid3_softc *sc)
g_topology_unlock();
}
-/*
+/*
* Return 1 if we should check if RAID3 device is idling.
*/
-static int
+static int
g_raid3_check_idle(struct g_raid3_softc *sc)
-{
+{
struct g_raid3_disk *disk;
u_int i;
@@ -831,17 +831,17 @@ g_raid3_check_idle(struct g_raid3_softc *sc)
return (0);
if (sc->sc_provider != NULL && sc->sc_provider->acw == 0)
return (0);
- /*
+ /*
* Check if there are no in-flight requests.
- */
+ */
for (i = 0; i < sc->sc_ndisks; i++) {
disk = &sc->sc_disks[i];
if (disk->d_state != G_RAID3_DISK_STATE_ACTIVE)
continue;
if (disk->d_consumer->index > 0)
return (0);
- }
- return (1);
+ }
+ return (1);
}
/*
@@ -1201,7 +1201,7 @@ g_raid3_done(struct bio *bp)
struct g_raid3_softc *sc;
sc = bp->bio_from->geom->softc;
- bp->bio_cflags |= G_RAID3_BIO_CFLAG_REGULAR;
+ bp->bio_cflags |= G_RAID3_BIO_CFLAG_REGULAR;
G_RAID3_LOGREQ(3, bp, "Regular request done (error=%d).", bp->bio_error);
mtx_lock(&sc->sc_queue_mtx);
bioq_insert_head(&sc->sc_queue, bp);
@@ -1678,7 +1678,7 @@ g_raid3_can_destroy(struct g_raid3_softc *sc)
{
struct g_geom *gp;
struct g_consumer *cp;
-
+
g_topology_assert();
gp = sc->sc_geom;
LIST_FOREACH(cp, &gp->consumer, consumer) {
@@ -1694,11 +1694,11 @@ g_raid3_can_destroy(struct g_raid3_softc *sc)
sc->sc_name);
return (1);
}
-
+
static int
g_raid3_try_destroy(struct g_raid3_softc *sc)
{
-
+
if (sc->sc_rootmount != NULL) {
G_RAID3_DEBUG(1, "root_mount_rel[%u] %p", __LINE__,
sc->sc_rootmount);
@@ -2253,11 +2253,11 @@ g_raid3_update_device(struct g_raid3_softc *sc, boolean_t force)
continue;
}
disk->d_flags |=
- G_RAID3_DISK_FLAG_SYNCHRONIZING;
+ G_RAID3_DISK_FLAG_SYNCHRONIZING;
}
} else if (ndisks == sc->sc_ndisks && ndirty > 1) {
disk = &sc->sc_disks[sc->sc_ndisks - 1];
- disk->d_flags |= G_RAID3_DISK_FLAG_SYNCHRONIZING;
+ disk->d_flags |= G_RAID3_DISK_FLAG_SYNCHRONIZING;
}
sc->sc_syncid = syncid;
@@ -2828,9 +2828,9 @@ g_raid3_create(struct g_class *mp, const struct g_raid3_metadata *md)
if (error != 0) {
G_RAID3_DEBUG(1, "Cannot create kernel thread for %s.",
sc->sc_name);
- uma_zdestroy(sc->sc_zone_64k);
- uma_zdestroy(sc->sc_zone_16k);
- uma_zdestroy(sc->sc_zone_4k);
+ uma_zdestroy(sc->sc_zone_64k);
+ uma_zdestroy(sc->sc_zone_16k);
+ uma_zdestroy(sc->sc_zone_4k);
g_destroy_geom(sc->sc_sync.ds_geom);
mtx_destroy(&sc->sc_events_mtx);
mtx_destroy(&sc->sc_queue_mtx);
diff --git a/sys/geom/raid3/g_raid3.h b/sys/geom/raid3/g_raid3.h
index b666c8a..4ee8d03 100644
--- a/sys/geom/raid3/g_raid3.h
+++ b/sys/geom/raid3/g_raid3.h
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -354,7 +354,7 @@ static __inline int
raid3_metadata_decode(const u_char *data, struct g_raid3_metadata *md)
{
int error;
-
+
bcopy(data, md->md_magic, 16);
md->md_version = le32dec(data + 16);
switch (md->md_version) {
diff --git a/sys/geom/raid3/g_raid3_ctl.c b/sys/geom/raid3/g_raid3_ctl.c
index 2edbe46..5a4a07b 100644
--- a/sys/geom/raid3/g_raid3_ctl.c
+++ b/sys/geom/raid3/g_raid3_ctl.c
@@ -10,7 +10,7 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
OpenPOWER on IntegriCloud