Author: mjg
Date: Tue Sep  1 22:14:09 2020
New Revision: 365226
URL: https://svnweb.freebsd.org/changeset/base/365226

Log:
  geom: clean up empty lines in .c and .h files

Modified:
  head/sys/geom/bde/g_bde.c
  head/sys/geom/bde/g_bde.h
  head/sys/geom/bde/g_bde_crypt.c
  head/sys/geom/cache/g_cache.c
  head/sys/geom/concat/g_concat.c
  head/sys/geom/eli/g_eli.c
  head/sys/geom/eli/g_eli_ctl.c
  head/sys/geom/gate/g_gate.c
  head/sys/geom/geom_ccd.c
  head/sys/geom/geom_ctl.c
  head/sys/geom/geom_disk.c
  head/sys/geom/geom_dump.c
  head/sys/geom/geom_event.c
  head/sys/geom/geom_flashmap.h
  head/sys/geom/geom_io.c
  head/sys/geom/geom_kern.c
  head/sys/geom/geom_map.c
  head/sys/geom/geom_subr.c
  head/sys/geom/label/g_label.c
  head/sys/geom/label/g_label_disk_ident.c
  head/sys/geom/label/g_label_iso9660.c
  head/sys/geom/label/g_label_msdosfs.c
  head/sys/geom/mirror/g_mirror.c
  head/sys/geom/mountver/g_mountver.c
  head/sys/geom/multipath/g_multipath.c
  head/sys/geom/nop/g_nop.c
  head/sys/geom/part/g_part.c
  head/sys/geom/part/g_part_bsd64.c
  head/sys/geom/part/g_part_ebr.c
  head/sys/geom/part/g_part_ldm.c
  head/sys/geom/raid/g_raid_ctl.c
  head/sys/geom/raid/md_ddf.c
  head/sys/geom/raid/md_intel.c
  head/sys/geom/raid/md_jmicron.c
  head/sys/geom/raid/md_nvidia.c
  head/sys/geom/raid/md_promise.c
  head/sys/geom/raid/md_sii.c
  head/sys/geom/raid/tr_concat.c
  head/sys/geom/raid/tr_raid1.c
  head/sys/geom/raid/tr_raid1e.c
  head/sys/geom/raid3/g_raid3.c
  head/sys/geom/raid3/g_raid3_ctl.c
  head/sys/geom/uzip/g_uzip_wrkthr.h
  head/sys/geom/vinum/geom_vinum.c
  head/sys/geom/vinum/geom_vinum.h
  head/sys/geom/vinum/geom_vinum_drive.c
  head/sys/geom/vinum/geom_vinum_init.c
  head/sys/geom/vinum/geom_vinum_list.c
  head/sys/geom/vinum/geom_vinum_plex.c
  head/sys/geom/vinum/geom_vinum_raid5.c
  head/sys/geom/vinum/geom_vinum_share.c
  head/sys/geom/vinum/geom_vinum_state.c
  head/sys/geom/vinum/geom_vinum_subr.c
  head/sys/geom/virstor/binstream.c
  head/sys/geom/virstor/binstream.h
  head/sys/geom/virstor/g_virstor.c
  head/sys/geom/virstor/g_virstor.h
  head/sys/geom/virstor/g_virstor_md.c
  head/sys/geom/virstor/g_virstor_md.h
  head/sys/geom/zero/g_zero.c

Modified: head/sys/geom/bde/g_bde.c
==============================================================================
--- head/sys/geom/bde/g_bde.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/bde/g_bde.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -129,7 +129,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class
        g_topology_assert();
        gp = NULL;
 
-
        gp = g_new_geomf(mp, "%s.bde", pp->name);
        cp = g_new_consumer(gp);
        g_attach(cp, pp);
@@ -225,7 +224,6 @@ g_bde_create_geom(struct gctl_req *req, struct g_class
        }
        return;
 }
-
 
 static int
 g_bde_destroy_geom(struct gctl_req *req, struct g_class *mp, struct g_geom *gp)

Modified: head/sys/geom/bde/g_bde.h
==============================================================================
--- head/sys/geom/bde/g_bde.h   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/bde/g_bde.h   Tue Sep  1 22:14:09 2020        (r365226)
@@ -54,7 +54,6 @@
 #define G_BDE_LOCKSIZE 384
 #define NLOCK_FIELDS   13
 
-
 /* This just needs to be "large enough" */
 #define G_BDE_KEYBYTES 304
 

Modified: head/sys/geom/bde/g_bde_crypt.c
==============================================================================
--- head/sys/geom/bde/g_bde_crypt.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/bde/g_bde_crypt.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -124,7 +124,6 @@ g_bde_crypt_read(struct g_bde_work *wp)
        u_char skey[G_BDE_SKEYLEN];
        keyInstance ki;
        cipherInstance ci;
-       
 
        AES_init(&ci);
        sc = wp->softc;
@@ -164,7 +163,6 @@ g_bde_crypt_write(struct g_bde_work *wp)
        AES_init(&ci);
        o = 0;
        for (n = 0; o < wp->length; n++, o += sc->sectorsize) {
-
                s = (u_char *)wp->data + o;
                d = (u_char *)wp->sp->data + o;
                arc4rand(skey, sizeof skey, 0);

Modified: head/sys/geom/cache/g_cache.c
==============================================================================
--- head/sys/geom/cache/g_cache.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/cache/g_cache.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -93,7 +93,6 @@ SYSCTL_PROC(_kern_geom_cache, OID_AUTO, used_hi,
     sysctl_handle_pct, "IU",
     "");
 
-
 static int g_cache_destroy(struct g_cache_softc *sc, boolean_t force);
 static g_ctl_destroy_geom_t g_cache_destroy_geom;
 
@@ -111,7 +110,6 @@ struct g_class g_cache_class = {
 
 #define        OFF2BNO(off, sc)        ((off) >> (sc)->sc_bshift)
 #define        BNO2OFF(bno, sc)        ((bno) << (sc)->sc_bshift)
-
 
 static struct g_cache_desc *
 g_cache_alloc(struct g_cache_softc *sc)

Modified: head/sys/geom/concat/g_concat.c
==============================================================================
--- head/sys/geom/concat/g_concat.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/concat/g_concat.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -70,7 +70,6 @@ struct g_class g_concat_class = {
        .destroy_geom = g_concat_destroy_geom
 };
 
-
 /*
  * Greatest Common Divisor.
  */

Modified: head/sys/geom/eli/g_eli.c
==============================================================================
--- head/sys/geom/eli/g_eli.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/eli/g_eli.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -176,7 +176,6 @@ struct g_class g_eli_class = {
        .fini = g_eli_fini
 };
 
-
 /*
  * Code paths:
  * BIO_READ:
@@ -184,7 +183,6 @@ struct g_class g_eli_class = {
  * BIO_WRITE:
  *     g_eli_start -> g_eli_crypto_run -> g_eli_crypto_write_done -> 
g_io_request -> g_eli_write_done -> g_io_deliver
  */
-
 
 /*
  * EAGAIN from crypto(9) means, that we were probably balanced to another 
crypto

Modified: head/sys/geom/eli/g_eli_ctl.c
==============================================================================
--- head/sys/geom/eli/g_eli_ctl.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/eli/g_eli_ctl.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -49,9 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <geom/geom_dbg.h>
 #include <geom/eli/g_eli.h>
 
-
 MALLOC_DECLARE(M_ELI);
-
 
 static void
 g_eli_ctl_attach(struct gctl_req *req, struct g_class *mp)

Modified: head/sys/geom/gate/g_gate.c
==============================================================================
--- head/sys/geom/gate/g_gate.c Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/gate/g_gate.c Tue Sep  1 22:14:09 2020        (r365226)
@@ -84,7 +84,6 @@ static struct cdevsw g_gate_cdevsw = {
        .d_name =       G_GATE_CTL_NAME
 };
 
-
 static struct g_gate_softc **g_gate_units;
 static u_int g_gate_nunits;
 static struct mtx g_gate_units_lock;

Modified: head/sys/geom/geom_ccd.c
==============================================================================
--- head/sys/geom/geom_ccd.c    Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_ccd.c    Tue Sep  1 22:14:09 2020        (r365226)
@@ -233,7 +233,6 @@ g_ccd_freesc(struct ccd_s *sc)
        g_free(sc);
 }
 
-
 static int
 ccdinit(struct gctl_req *req, struct ccd_s *cs)
 {
@@ -261,7 +260,6 @@ ccdinit(struct gctl_req *req, struct ccd_s *cs)
                        cs->sc_offset = 0;
                else
                        cs->sc_offset = CCD_OFFSET;
-
        }
        for (ix = 0; ix < cs->sc_ndisks; ix++) {
                ci = &cs->sc_cinfo[ix];
@@ -358,7 +356,6 @@ ccdinterleave(struct ccd_s *cs)
        daddr_t bn, lbn;
        int ix;
        daddr_t size;
-
 
        /*
         * Allocate an interleave table.  The worst case occurs when each

Modified: head/sys/geom/geom_ctl.c
==============================================================================
--- head/sys/geom/geom_ctl.c    Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_ctl.c    Tue Sep  1 22:14:09 2020        (r365226)
@@ -470,7 +470,6 @@ g_ctl_req(void *arg, int flag __unused)
        g_topology_assert();
 }
 
-
 static int
 g_ctl_ioctl_ctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct 
thread *td)
 {

Modified: head/sys/geom/geom_disk.c
==============================================================================
--- head/sys/geom/geom_disk.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_disk.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -1081,7 +1081,7 @@ sysctl_disks(SYSCTL_HANDLER_ARGS)
        sbuf_delete(sb);
        return error;
 }
- 
+
 SYSCTL_PROC(_kern, OID_AUTO, disks,
     CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0,
     sysctl_disks, "A", "names of available disks");

Modified: head/sys/geom/geom_dump.c
==============================================================================
--- head/sys/geom/geom_dump.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_dump.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <geom/geom_int.h>
 #include <geom/geom_disk.h>
 
-
 static void
 g_confdot_consumer(struct sbuf *sb, struct g_consumer *cp)
 {
@@ -241,7 +240,6 @@ g_conf_provider(struct sbuf *sb, struct g_provider *pp
        }
        sbuf_cat(sb, "\t</provider>\n");
 }
-
 
 static void
 g_conf_geom(struct sbuf *sb, struct g_geom *gp, struct g_provider *pp, struct 
g_consumer *cp)

Modified: head/sys/geom/geom_event.c
==============================================================================
--- head/sys/geom/geom_event.c  Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_event.c  Tue Sep  1 22:14:09 2020        (r365226)
@@ -131,7 +131,6 @@ g_attr_changed_event(void *arg, int flag)
 
        g_topology_assert();
        if (flag != EV_CANCEL && g_shutdown == 0) {
-
                /*
                 * Tell all consumers of the change.
                 */
@@ -170,7 +169,7 @@ g_orphan_provider(struct g_provider *pp, int error)
        KASSERT(error != 0,
            ("g_orphan_provider(%p(%s), 0) error must be non-zero\n",
             pp, pp->name));
-       
+
        pp->error = error;
        mtx_lock(&g_eventlock);
        KASSERT(!(pp->flags & G_PF_ORPHAN),

Modified: head/sys/geom/geom_flashmap.h
==============================================================================
--- head/sys/geom/geom_flashmap.h       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/geom_flashmap.h       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -36,4 +36,3 @@ struct g_flashmap {
 };
 
 #endif
-

Modified: head/sys/geom/geom_io.c
==============================================================================
--- head/sys/geom/geom_io.c     Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_io.c     Tue Sep  1 22:14:09 2020        (r365226)
@@ -305,7 +305,7 @@ g_io_zonecmd(struct disk_zone_args *zone_args, struct 
 {
        struct bio *bp;
        int error;
-       
+
        g_trace(G_T_BIO, "bio_zone(%d)", zone_args->zone_cmd);
        bp = g_alloc_bio();
        bp->bio_cmd = BIO_ZONE;

Modified: head/sys/geom/geom_kern.c
==============================================================================
--- head/sys/geom/geom_kern.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_kern.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -187,7 +187,7 @@ sysctl_kern_geom_conftxt(SYSCTL_HANDLER_ARGS)
 
        return (sysctl_kern_geom_confany(req, g_conftxt, &hint));
 }
- 
+
 static int
 sysctl_kern_geom_confdot(SYSCTL_HANDLER_ARGS)
 {

Modified: head/sys/geom/geom_map.c
==============================================================================
--- head/sys/geom/geom_map.c    Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_map.c    Tue Sep  1 22:14:09 2020        (r365226)
@@ -172,7 +172,6 @@ find_marker(struct g_consumer *cp, const char *line, o
        for (search_offset = search_start;
             search_offset < cp->provider->mediasize;
             search_offset += search_step) {
-
                g_topology_unlock();
                buf = g_read_data(cp, rounddown(search_offset, sectorsize),
                    roundup(strlen(search_key), sectorsize), NULL);
@@ -375,7 +374,6 @@ g_map_taste(struct g_class *mp, struct g_provider *pp,
 
        for (i = 0; i < MAP_MAXSLICE; i++)
                g_map_parse_part(mp, pp, cp, gp, sc, i);
-
 
        g_access(cp, -1, 0, 0);
        if (LIST_EMPTY(&gp->provider)) {

Modified: head/sys/geom/geom_subr.c
==============================================================================
--- head/sys/geom/geom_subr.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/geom_subr.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -101,7 +101,7 @@ g_dbg_printf(const char *classname, int lvl, struct bi
        sbuf_cat(&sb, classname);
        if (lvl >= 0)
                sbuf_printf(&sb, "[%d]", lvl);
-       
+
        va_start(ap, format);
        sbuf_vprintf(&sb, format, ap);
        va_end(ap);
@@ -598,7 +598,6 @@ g_new_provider_event(void *arg, int flag)
        }
 }
 
-
 struct g_provider *
 g_new_providerf(struct g_geom *gp, const char *fmt, ...)
 {
@@ -717,7 +716,7 @@ g_resize_provider_event(void *arg, int flag)
        }
 
        pp->mediasize = size;
-       
+
        LIST_FOREACH_SAFE(cp, &pp->consumers, consumers, cp2) {
                gp = cp->geom;
                if ((gp->flags & G_GEOM_WITHER) == 0 && gp->resize != NULL)

Modified: head/sys/geom/label/g_label.c
==============================================================================
--- head/sys/geom/label/g_label.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/label/g_label.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -203,7 +203,6 @@ g_label_mangle_name(char *label, size_t size)
        if (*label == '\0')
                return;
 
-
        sb = sbuf_new(NULL, NULL, size, SBUF_FIXEDLEN);
        for (c = label; *c != '\0'; c++) {
                /* Trim leading whitespace. */

Modified: head/sys/geom/label/g_label_disk_ident.c
==============================================================================
--- head/sys/geom/label/g_label_disk_ident.c    Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/label/g_label_disk_ident.c    Tue Sep  1 22:14:09 2020        
(r365226)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <geom/label/g_label.h>
 #include <geom/multipath/g_multipath.h>
 
-
 static char* classes_pass[] = { G_DISK_CLASS_NAME, G_MULTIPATH_CLASS_NAME,
     NULL };
 

Modified: head/sys/geom/label/g_label_iso9660.c
==============================================================================
--- head/sys/geom/label/g_label_iso9660.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/label/g_label_iso9660.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #define        ISO9660_OFFSET  0x8000
 #define        VOLUME_LEN      32
 
-
 static void
 g_label_iso9660_taste(struct g_consumer *cp, char *label, size_t size)
 {

Modified: head/sys/geom/label/g_label_msdosfs.c
==============================================================================
--- head/sys/geom/label/g_label_msdosfs.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/label/g_label_msdosfs.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -82,7 +82,6 @@ g_label_msdosfs_taste(struct g_consumer *cp, char *lab
                goto error;
        }
 
-
        /*
         * Test if this is really a FAT volume and determine the FAT type.
         */

Modified: head/sys/geom/mirror/g_mirror.c
==============================================================================
--- head/sys/geom/mirror/g_mirror.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/mirror/g_mirror.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -110,7 +110,6 @@ struct g_class g_mirror_class = {
        .resize = g_mirror_resize
 };
 
-
 static void g_mirror_destroy_provider(struct g_mirror_softc *sc);
 static int g_mirror_update_disk(struct g_mirror_disk *disk, u_int state);
 static void g_mirror_update_device(struct g_mirror_softc *sc, bool force);
@@ -124,7 +123,6 @@ static void g_mirror_sync_stop(struct g_mirror_disk *d
 static void g_mirror_register_request(struct g_mirror_softc *sc,
     struct bio *bp);
 static void g_mirror_sync_release(struct g_mirror_softc *sc);
-
 
 static const char *
 g_mirror_disk_state2str(int state)

Modified: head/sys/geom/mountver/g_mountver.c
==============================================================================
--- head/sys/geom/mountver/g_mountver.c Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/mountver/g_mountver.c Tue Sep  1 22:14:09 2020        
(r365226)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <geom/geom_dbg.h>
 #include <geom/mountver/g_mountver.h>
 
-
 SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW | CTLFLAG_MPSAFE,
     0, "GEOM_MOUNTVER stuff");
@@ -555,7 +554,7 @@ g_mountver_ident_matches(struct g_geom *gp)
 
        return (0);
 }
-       
+
 static struct g_geom *
 g_mountver_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 {

Modified: head/sys/geom/multipath/g_multipath.c
==============================================================================
--- head/sys/geom/multipath/g_multipath.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/multipath/g_multipath.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -479,7 +479,6 @@ g_multipath_kt(void *arg)
        kproc_exit(0);
 }
 
-
 static int
 g_multipath_access(struct g_provider *pp, int dr, int dw, int de)
 {

Modified: head/sys/geom/nop/g_nop.c
==============================================================================
--- head/sys/geom/nop/g_nop.c   Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/nop/g_nop.c   Tue Sep  1 22:14:09 2020        (r365226)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <geom/geom_dbg.h>
 #include <geom/nop/g_nop.h>
 
-
 SYSCTL_DECL(_kern_geom);
 static SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
     "GEOM_NOP stuff");

Modified: head/sys/geom/part/g_part.c
==============================================================================
--- head/sys/geom/part/g_part.c Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/part/g_part.c Tue Sep  1 22:14:09 2020        (r365226)
@@ -317,7 +317,6 @@ g_part_get_physpath_done(struct bio *bp)
        g_std_done(bp);
 }
 
-
 #define        DPRINTF(...)    if (bootverbose) {      \
        printf("GEOM_PART: " __VA_ARGS__);      \
 }

Modified: head/sys/geom/part/g_part_bsd64.c
==============================================================================
--- head/sys/geom/part/g_part_bsd64.c   Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/part/g_part_bsd64.c   Tue Sep  1 22:14:09 2020        
(r365226)
@@ -663,4 +663,3 @@ g_part_bsd64_write(struct g_part_table *basetable, str
        g_free(dlp);
        return (error);
 }
-

Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/part/g_part_ebr.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -210,7 +210,6 @@ ebr_parse_type(const char *type, u_char *dp_typ)
        return (EINVAL);
 }
 
-
 static void
 ebr_set_chs(struct g_part_table *table, uint32_t lba, u_char *cylp, u_char 
*hdp,
     u_char *secp)
@@ -248,7 +247,6 @@ ebr_align(struct g_part_table *basetable, uint32_t *st
                return (EINVAL);
        return (0);
 }
-
 
 static int
 g_part_ebr_add(struct g_part_table *basetable, struct g_part_entry *baseentry,

Modified: head/sys/geom/part/g_part_ldm.c
==============================================================================
--- head/sys/geom/part/g_part_ldm.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/part/g_part_ldm.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -1286,7 +1286,6 @@ g_part_ldm_probe(struct g_part_table *basetable, struc
        u_char *buf, type[64];
        int error, idx;
 
-
        pp = cp->provider;
        if (pp->sectorsize != 512)
                return (ENXIO);

Modified: head/sys/geom/raid/g_raid_ctl.c
==============================================================================
--- head/sys/geom/raid/g_raid_ctl.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/g_raid_ctl.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <geom/raid/g_raid.h>
 #include "g_raid_md_if.h"
 
-
 static struct g_raid_softc *
 g_raid_find_node(struct g_class *mp, const char *name)
 {

Modified: head/sys/geom/raid/md_ddf.c
==============================================================================
--- head/sys/geom/raid/md_ddf.c Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/raid/md_ddf.c Tue Sep  1 22:14:09 2020        (r365226)
@@ -2270,7 +2270,6 @@ g_raid_md_ctl_ddf(struct g_raid_md_object *md,
        error = 0;
 
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -2511,13 +2510,11 @@ g_raid_md_ctl_ddf(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "add") == 0) {
-
                gctl_error(req, "`add` command is not applicable, "
                    "use `label` instead.");
                return (-99);
        }
        if (strcmp(verb, "delete") == 0) {
-
                nodename = gctl_get_asciiparam(req, "arg0");
                if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0)
                        nodename = NULL;

Modified: head/sys/geom/raid/md_intel.c
==============================================================================
--- head/sys/geom/raid/md_intel.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/md_intel.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -261,7 +261,6 @@ static struct g_raid_md_class g_raid_md_intel_class = 
        .mdc_priority = 100
 };
 
-
 static struct intel_raid_map *
 intel_get_map(struct intel_raid_vol *mvol, int i)
 {
@@ -1454,7 +1453,7 @@ g_raid_md_get_label(struct g_consumer *cp, char *seria
 {
        char serial_buffer[DISK_IDENT_SIZE];
        int len, error;
-       
+
        len = sizeof(serial_buffer);
        error = g_io_getattr("GEOM::ident", cp, &len, serial_buffer);
        if (error != 0)
@@ -1712,7 +1711,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md,
        nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
        error = 0;
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -1921,7 +1919,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "add") == 0) {
-
                if (*nargs != 3) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -2108,7 +2105,6 @@ g_raid_md_ctl_intel(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "delete") == 0) {
-
                nodename = gctl_get_asciiparam(req, "arg0");
                if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0)
                        nodename = NULL;

Modified: head/sys/geom/raid/md_jmicron.c
==============================================================================
--- head/sys/geom/raid/md_jmicron.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/md_jmicron.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -527,7 +527,6 @@ nofit:
        /* Welcome the new disk. */
        g_raid_change_disk_state(disk, G_RAID_DISK_S_ACTIVE);
        TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) {
-
                /*
                 * Different disks may have different sizes/offsets,
                 * especially in concat mode. Update.
@@ -1044,7 +1043,6 @@ g_raid_md_ctl_jmicron(struct g_raid_md_object *md,
        nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
        error = 0;
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -1238,7 +1236,6 @@ g_raid_md_ctl_jmicron(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "delete") == 0) {
-
                /* Check if some volume is still open. */
                force = gctl_get_paraml(req, "force", sizeof(*force));
                if (force != NULL && *force == 0 &&

Modified: head/sys/geom/raid/md_nvidia.c
==============================================================================
--- head/sys/geom/raid/md_nvidia.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/md_nvidia.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -535,7 +535,6 @@ nofit:
 //     else
 //             g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED);
        TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) {
-
                /*
                 * Different disks may have different sizes,
                 * in concat mode. Update from real disk size.
@@ -1048,7 +1047,6 @@ g_raid_md_ctl_nvidia(struct g_raid_md_object *md,
        nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
        error = 0;
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -1243,7 +1241,6 @@ g_raid_md_ctl_nvidia(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "delete") == 0) {
-
                /* Check if some volume is still open. */
                force = gctl_get_paraml(req, "force", sizeof(*force));
                if (force != NULL && *force == 0 &&

Modified: head/sys/geom/raid/md_promise.c
==============================================================================
--- head/sys/geom/raid/md_promise.c     Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/md_promise.c     Tue Sep  1 22:14:09 2020        
(r365226)
@@ -189,7 +189,6 @@ static struct g_raid_md_class g_raid_md_promise_class 
        .mdc_priority = 100
 };
 
-
 static void
 g_raid_md_promise_print(struct promise_raid_conf *meta)
 {
@@ -1281,7 +1280,6 @@ g_raid_md_ctl_promise(struct g_raid_md_object *md,
        nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
        error = 0;
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -1502,13 +1500,11 @@ g_raid_md_ctl_promise(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "add") == 0) {
-
                gctl_error(req, "`add` command is not applicable, "
                    "use `label` instead.");
                return (-99);
        }
        if (strcmp(verb, "delete") == 0) {
-
                nodename = gctl_get_asciiparam(req, "arg0");
                if (nodename != NULL && strcasecmp(sc->sc_name, nodename) != 0)
                        nodename = NULL;

Modified: head/sys/geom/raid/md_sii.c
==============================================================================
--- head/sys/geom/raid/md_sii.c Tue Sep  1 22:13:48 2020        (r365225)
+++ head/sys/geom/raid/md_sii.c Tue Sep  1 22:14:09 2020        (r365226)
@@ -586,7 +586,6 @@ nofit:
        else
                g_raid_change_disk_state(disk, G_RAID_DISK_S_FAILED);
        TAILQ_FOREACH(sd, &disk->d_subdisks, sd_next) {
-
                /*
                 * Different disks may have different sizes,
                 * in concat mode. Update from real disk size.
@@ -1132,7 +1131,6 @@ g_raid_md_ctl_sii(struct g_raid_md_object *md,
        nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
        error = 0;
        if (strcmp(verb, "label") == 0) {
-
                if (*nargs < 4) {
                        gctl_error(req, "Invalid number of arguments.");
                        return (-1);
@@ -1325,7 +1323,6 @@ g_raid_md_ctl_sii(struct g_raid_md_object *md,
                return (0);
        }
        if (strcmp(verb, "delete") == 0) {
-
                /* Check if some volume is still open. */
                force = gctl_get_paraml(req, "force", sizeof(*force));
                if (force != NULL && *force == 0 &&

Modified: head/sys/geom/raid/tr_concat.c
==============================================================================
--- head/sys/geom/raid/tr_concat.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/tr_concat.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -123,7 +123,6 @@ g_raid_tr_update_state_concat(struct g_raid_volume *vo
                        s = G_RAID_VOLUME_S_BROKEN;
        }
        if (s != vol->v_state) {
-
                /*
                 * Some metadata modules may not know CONCAT volume
                 * mediasize until all disks connected. Recalculate.

Modified: head/sys/geom/raid/tr_raid1.c
==============================================================================
--- head/sys/geom/raid/tr_raid1.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/tr_raid1.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -401,7 +401,6 @@ g_raid_tr_raid1_rebuild_start(struct g_raid_tr_object 
        g_raid_tr_raid1_rebuild_some(tr);
 }
 
-
 static void
 g_raid_tr_raid1_maybe_rebuild(struct g_raid_tr_object *tr,
     struct g_raid_subdisk *sd)
@@ -409,7 +408,7 @@ g_raid_tr_raid1_maybe_rebuild(struct g_raid_tr_object 
        struct g_raid_volume *vol;
        struct g_raid_tr_raid1_object *trs;
        int na, nr;
-       
+
        /*
         * If we're stopping, don't do anything.  If we don't have at least one
         * good disk and one bad disk, we don't do anything.  And if there's a
@@ -683,7 +682,6 @@ g_raid_tr_iodone_raid1(struct g_raid_tr_object *tr,
                 */
                if (trs->trso_type == TR_RAID1_REBUILD) {
                        if (bp->bio_cmd == BIO_READ) {
-
                                /* Immediately abort rebuild, if requested. */
                                if (trs->trso_flags & TR_RAID1_F_ABORT) {
                                        trs->trso_flags &= 
~TR_RAID1_F_DOING_SOME;

Modified: head/sys/geom/raid/tr_raid1e.c
==============================================================================
--- head/sys/geom/raid/tr_raid1e.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid/tr_raid1e.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -560,7 +560,7 @@ g_raid_tr_raid1e_maybe_rebuild(struct g_raid_tr_object
        struct g_raid_volume *vol;
        struct g_raid_tr_raid1e_object *trs;
        int nr;
-       
+
        vol = tr->tro_volume;
        trs = (struct g_raid_tr_raid1e_object *)tr;
        if (trs->trso_stopping)
@@ -899,7 +899,6 @@ g_raid_tr_iodone_raid1e(struct g_raid_tr_object *tr,
                if (trs->trso_type == TR_RAID1E_REBUILD) {
                        nsd = trs->trso_failed_sd;
                        if (bp->bio_cmd == BIO_READ) {
-
                                /* Immediately abort rebuild, if requested. */
                                if (trs->trso_flags & TR_RAID1E_F_ABORT) {
                                        trs->trso_flags &= 
~TR_RAID1E_F_DOING_SOME;

Modified: head/sys/geom/raid3/g_raid3.c
==============================================================================
--- head/sys/geom/raid3/g_raid3.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid3/g_raid3.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -117,7 +117,6 @@ struct g_class g_raid3_class = {
        .fini = g_raid3_fini
 };
 
-
 static void g_raid3_destroy_provider(struct g_raid3_softc *sc);
 static int g_raid3_update_disk(struct g_raid3_disk *disk, u_int state);
 static void g_raid3_update_device(struct g_raid3_softc *sc, boolean_t force);
@@ -126,7 +125,6 @@ static void g_raid3_dumpconf(struct sbuf *sb, const ch
 static void g_raid3_sync_stop(struct g_raid3_softc *sc, int type);
 static int g_raid3_register_request(struct bio *pbp);
 static void g_raid3_sync_release(struct g_raid3_softc *sc);
-
 
 static const char *
 g_raid3_disk_state2str(int state)

Modified: head/sys/geom/raid3/g_raid3_ctl.c
==============================================================================
--- head/sys/geom/raid3/g_raid3_ctl.c   Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/raid3/g_raid3_ctl.c   Tue Sep  1 22:14:09 2020        
(r365226)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/kthread.h>
 #include <geom/raid3/g_raid3.h>
 
-
 static struct g_raid3_softc *
 g_raid3_find_device(struct g_class *mp, const char *name)
 {

Modified: head/sys/geom/uzip/g_uzip_wrkthr.h
==============================================================================
--- head/sys/geom/uzip/g_uzip_wrkthr.h  Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/uzip/g_uzip_wrkthr.h  Tue Sep  1 22:14:09 2020        
(r365226)
@@ -27,4 +27,3 @@
  */
 
 void g_uzip_wrkthr(void *);
-

Modified: head/sys/geom/vinum/geom_vinum.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum.c    Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum.c    Tue Sep  1 22:14:09 2020        
(r365226)
@@ -61,14 +61,13 @@ static void gv_attach(struct gv_softc *, struct gctl_r
 static void    gv_detach(struct gv_softc *, struct gctl_req *);
 static void    gv_parityop(struct gv_softc *, struct gctl_req *);
 
-
 static void
 gv_orphan(struct g_consumer *cp)
 {
        struct g_geom *gp;
        struct gv_softc *sc;
        struct gv_drive *d;
-       
+
        g_topology_assert();
 
        KASSERT(cp != NULL, ("gv_orphan: null cp"));
@@ -89,7 +88,7 @@ gv_start(struct bio *bp)
 {
        struct g_geom *gp;
        struct gv_softc *sc;
-       
+
        gp = bp->bio_to->geom;
        sc = gp->softc;
 
@@ -114,7 +113,7 @@ gv_done(struct bio *bp)
 {
        struct g_geom *gp;
        struct gv_softc *sc;
-       
+
        KASSERT(bp != NULL, ("NULL bp"));
 
        gp = bp->bio_from->geom;
@@ -133,7 +132,7 @@ gv_access(struct g_provider *pp, int dr, int dw, int d
        struct gv_softc *sc;
        struct gv_drive *d, *d2;
        int error;
-       
+
        gp = pp->geom;
        sc = gp->softc;
        /*
@@ -367,7 +366,6 @@ gv_create(struct g_geom *gp, struct gctl_req *req)
                        goto error;
                }
 
-
                d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO);
                bcopy(d2, d, sizeof(*d));
 
@@ -513,7 +511,7 @@ gv_config(struct gctl_req *req, struct g_class *mp, ch
 
        } else if (!strcmp(verb, "rename")) {
                gv_rename(gp, req);
-       
+
        } else if (!strcmp(verb, "resetconfig")) {
                gv_post_event(sc, GV_EVENT_RESET_CONFIG, sc, NULL, 0, 0);
 
@@ -580,7 +578,6 @@ gv_parityop(struct gv_softc *sc, struct gctl_req *req)
        else
                gv_post_event(sc, GV_EVENT_PARITY_CHECK, p, NULL, 0, 0);
 }
-
 
 static struct g_geom *
 gv_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)

Modified: head/sys/geom/vinum/geom_vinum.h
==============================================================================
--- head/sys/geom/vinum/geom_vinum.h    Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum.h    Tue Sep  1 22:14:09 2020        
(r365226)
@@ -77,7 +77,6 @@ void  gv_rm_drive(struct gv_softc *, struct gv_drive *,
 void   gv_rm_plex(struct gv_softc *, struct gv_plex *);
 void   gv_rm_vol(struct gv_softc *, struct gv_volume *);
 
-
 /* geom_vinum_state.c */
 int    gv_sdstatemap(struct gv_plex *);
 void   gv_setstate(struct g_geom *, struct gctl_req *);

Modified: head/sys/geom/vinum/geom_vinum_drive.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_drive.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_drive.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -71,7 +71,6 @@ static int    gv_legacy_header_type(uint8_t *, int);
  * format uses big-endian (network order).
  */
 
-
 /* Checks for legacy format depending on platform. */
 static int
 gv_legacy_header_type(uint8_t *hdr, int bigendian)

Modified: head/sys/geom/vinum/geom_vinum_init.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_init.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_init.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -241,7 +241,6 @@ gv_sync(struct gv_volume *v)
        sc = v->vinumconf;
        KASSERT(sc != NULL, ("gv_sync: NULL sc on %s", v->name));
 
-
        up = gv_find_good_plex(v);
        if (up == NULL)
                return (ENXIO);

Modified: head/sys/geom/vinum/geom_vinum_list.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_list.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_list.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -228,7 +228,7 @@ gv_lv(struct g_geom *gp, struct gctl_req *req, struct 
 
        LIST_FOREACH(v, &sc->volumes, volume)
                i++;
-       
+
        sbuf_printf(sb, "%d volume%s:\n", i, i == 1 ? "" : "s");
 
        if (i) {
@@ -374,7 +374,7 @@ gv_ls(struct g_geom *gp, struct gctl_req *req, struct 
 
        LIST_FOREACH(s, &sc->subdisks, sd)
                i++;
-       
+
        sbuf_printf(sb, "%d subdisk%s:\n", i, i == 1 ? "" : "s");
 
        if (i) {
@@ -449,7 +449,7 @@ gv_ld(struct g_geom *gp, struct gctl_req *req, struct 
 
        LIST_FOREACH(d, &sc->drives, drive)
                i++;
-       
+
        sbuf_printf(sb, "%d drive%s:\n", i, i == 1 ? "" : "s");
 
        if (i) {

Modified: head/sys/geom/vinum/geom_vinum_plex.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_plex.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_plex.c       Tue Sep  1 22:14:09 2020        
(r365226)
@@ -78,7 +78,7 @@ gv_plex_start(struct gv_plex *p, struct bio *bp)
                        wp = gv_raid5_start(p, bp, addr, boff, bcount);
                        if (wp == NULL)
                                return;
- 
+
                        len = wp->length;
 
                        if (TAILQ_EMPTY(&wp->bits))
@@ -499,7 +499,6 @@ gv_check_parity(struct gv_plex *p, struct bio *bp, str
                        bp->bio_parent->bio_inbed++;
                        g_destroy_bio(pbp);
                }
-
        }
 
        return (finished);
@@ -776,7 +775,6 @@ gv_grow_complete(struct gv_plex *p, struct bio *bp)
        }
 }
 
-
 /*
  * Create an initialization BIO and send it off to the consumer. Assume that
  * we're given initialization data as parameter.
@@ -1019,7 +1017,7 @@ gv_rebuild_complete(struct gv_plex *p, struct bio *bp)
                g_topology_lock();
                gv_access(p->vol_sc->provider, -1, -1, 0);
                g_topology_unlock();
-       
+
                G_VINUM_DEBUG(0, "rebuild of %s failed at offset %jd errno: %d",
                    p->name, (intmax_t)offset, error);
                p->flags &= ~GV_PLEX_REBUILDING;
@@ -1035,7 +1033,7 @@ gv_rebuild_complete(struct gv_plex *p, struct bio *bp)
                g_topology_lock();
                gv_access(p->vol_sc->provider, -1, -1, 0);
                g_topology_unlock();
-       
+
                G_VINUM_DEBUG(1, "rebuild of %s finished", p->name);
                gv_save_config(p->vinumconf);
                p->flags &= ~GV_PLEX_REBUILDING;

Modified: head/sys/geom/vinum/geom_vinum_raid5.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_raid5.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_raid5.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -80,7 +80,7 @@ gv_raid5_start(struct gv_plex *p, struct bio *bp, cadd
                g_free(wp);
                return (NULL);
        }
-       
+
        /*
         * Building the sub-request failed, we probably need to clean up a lot.
         */

Modified: head/sys/geom/vinum/geom_vinum_share.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_share.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_share.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -80,9 +80,8 @@ gv_tokenize(char *cptr, char *token[], int maxtoken)
 {
        int tokennr;    /* Index of this token. */
        char delim;     /* Delimiter for searching for the partner. */
-       
-       for (tokennr = 0; tokennr < maxtoken;) {
 
+       for (tokennr = 0; tokennr < maxtoken;) {
                /* Skip leading white space. */
                while (iswhite(*cptr))
                        cptr++;
@@ -137,7 +136,6 @@ gv_tokenize(char *cptr, char *token[], int maxtoken)
        return maxtoken;
 }
 
-
 /*
  * Take a number with an optional scale factor and convert it to a number of
  * bytes.
@@ -159,7 +157,7 @@ gv_sizespec(char *spec)
        uint64_t size;
        char *s;
        int sign;
-       
+
        size = 0;
        sign = 1;
        if (spec != NULL) {             /* we have a parameter */
@@ -171,7 +169,6 @@ gv_sizespec(char *spec)
 
                /* It's numeric. */
                if ((*s >= '0') && (*s <= '9')) {
-
                        /* It's numeric. */
                        while ((*s >= '0') && (*s <= '9'))
                                /* Convert it. */
@@ -599,8 +596,6 @@ gv_new_plex(int max, char *token[])
        return (p);
 }
 
-
-
 /* Get a new subdisk object. */
 struct gv_sd *
 gv_new_sd(int max, char *token[])
@@ -707,7 +702,7 @@ const char *
 gv_roughlength(off_t bytes, int lj)
 {
        static char desc[16];
-       
+
        /* Gigabytes. */
        if (bytes > (off_t)MEGABYTE * 10000)
                snprintf(desc, sizeof(desc), lj ? "%jd GB" : "%10jd GB",

Modified: head/sys/geom/vinum/geom_vinum_state.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_state.c      Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_state.c      Tue Sep  1 22:14:09 2020        
(r365226)
@@ -130,7 +130,7 @@ gv_set_drive_state(struct gv_drive *d, int newstate, i
        KASSERT(d != NULL, ("gv_set_drive_state: NULL d"));
 
        oldstate = d->state;
-       
+
        if (newstate == oldstate)
                return (0);
 
@@ -166,7 +166,7 @@ gv_set_sd_state(struct gv_sd *s, int newstate, int fla
 
        /* We are optimistic and assume it will work. */
        status = 0;
-       
+
        if (newstate == oldstate)
                return (0);
 
@@ -385,7 +385,7 @@ gv_update_sd_state(struct gv_sd *s)
        KASSERT(d != NULL, ("gv_update_sd_state: NULL d"));
 
        oldstate = s->state;
-       
+
        /* If our drive isn't up we cannot be up either. */
        if (d->state != GV_DRIVE_UP) {
                s->state = GV_SD_DOWN;
@@ -401,7 +401,7 @@ gv_update_sd_state(struct gv_sd *s)
                        s->state = GV_SD_STALE;
        } else
                s->state = GV_SD_UP;
-       
+
        if (s->state != oldstate)
                G_VINUM_DEBUG(1, "subdisk %s state change: %s -> %s", s->name,
                    gv_sdstate(oldstate), gv_sdstate(s->state));
@@ -425,7 +425,7 @@ gv_update_plex_state(struct gv_plex *p)
 
        /* First, check the state of our subdisks. */
        sdstates = gv_sdstatemap(p);
-       
+
        /* If all subdisks are up, our plex can be up, too. */
        if (sdstates == GV_SD_UPSTATE)
                p->state = GV_PLEX_UP;
@@ -440,7 +440,6 @@ gv_update_plex_state(struct gv_plex *p)
 
        /* Some of our subdisks are initializing. */
        } else if (sdstates & GV_SD_INITSTATE) {
-
                if (p->flags & GV_PLEX_SYNCING ||
                    p->flags & GV_PLEX_REBUILDING)
                        p->state = GV_PLEX_DEGRADED;
@@ -507,7 +506,7 @@ gv_sdstatemap(struct gv_plex *p)
        int statemap;
 
        KASSERT(p != NULL, ("gv_sdstatemap: NULL p"));
-       
+
        statemap = 0;
        p->sddown = 0;  /* No subdisks down yet. */
 

Modified: head/sys/geom/vinum/geom_vinum_subr.c
==============================================================================
--- head/sys/geom/vinum/geom_vinum_subr.c       Tue Sep  1 22:13:48 2020        
(r365225)
+++ head/sys/geom/vinum/geom_vinum_subr.c       Tue Sep  1 22:14:09 2020        
(r365226)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to