diff options
author | ed <ed@FreeBSD.org> | 2011-11-07 15:43:11 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-11-07 15:43:11 +0000 |
commit | 0c56cf839d3e773173db46a972d3792e8a36820d (patch) | |
tree | bf1175813c8ae55dc563480a7eadad2ffae50256 /sys/geom | |
parent | 599a401646fe914e6aca992bf3d53f0d7b937253 (diff) | |
download | FreeBSD-src-0c56cf839d3e773173db46a972d3792e8a36820d.zip FreeBSD-src-0c56cf839d3e773173db46a972d3792e8a36820d.tar.gz |
Mark all SYSCTL_NODEs static that have no corresponding SYSCTL_DECLs.
The SYSCTL_NODE macro defines a list that stores all child-elements of
that node. If there's no SYSCTL_DECL macro anywhere else, there's no
reason why it shouldn't be static.
Diffstat (limited to 'sys/geom')
-rw-r--r-- | sys/geom/cache/g_cache.c | 3 | ||||
-rw-r--r-- | sys/geom/concat/g_concat.c | 3 | ||||
-rw-r--r-- | sys/geom/gate/g_gate.c | 3 | ||||
-rw-r--r-- | sys/geom/geom_disk.c | 3 | ||||
-rw-r--r-- | sys/geom/journal/g_journal.c | 7 | ||||
-rw-r--r-- | sys/geom/mirror/g_mirror.c | 3 | ||||
-rw-r--r-- | sys/geom/mountver/g_mountver.c | 2 | ||||
-rw-r--r-- | sys/geom/multipath/g_multipath.c | 2 | ||||
-rw-r--r-- | sys/geom/nop/g_nop.c | 2 | ||||
-rw-r--r-- | sys/geom/part/g_part.c | 3 | ||||
-rw-r--r-- | sys/geom/raid/tr_raid1.c | 2 | ||||
-rw-r--r-- | sys/geom/raid/tr_raid1e.c | 2 | ||||
-rw-r--r-- | sys/geom/raid3/g_raid3.c | 5 | ||||
-rw-r--r-- | sys/geom/sched/gs_rr.c | 2 | ||||
-rw-r--r-- | sys/geom/shsec/g_shsec.c | 3 | ||||
-rw-r--r-- | sys/geom/stripe/g_stripe.c | 3 | ||||
-rw-r--r-- | sys/geom/vinum/geom_vinum.c | 3 | ||||
-rw-r--r-- | sys/geom/virstor/g_virstor.c | 3 | ||||
-rw-r--r-- | sys/geom/zero/g_zero.c | 3 |
19 files changed, 35 insertions, 22 deletions
diff --git a/sys/geom/cache/g_cache.c b/sys/geom/cache/g_cache.c index fc3490f..378c2f2 100644 --- a/sys/geom/cache/g_cache.c +++ b/sys/geom/cache/g_cache.c @@ -48,7 +48,8 @@ FEATURE(geom_cache, "GEOM cache module"); static MALLOC_DEFINE(M_GCACHE, "gcache_data", "GEOM_CACHE Data"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, cache, CTLFLAG_RW, 0, "GEOM_CACHE stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, cache, CTLFLAG_RW, 0, + "GEOM_CACHE stuff"); static u_int g_cache_debug = 0; SYSCTL_UINT(_kern_geom_cache, OID_AUTO, debug, CTLFLAG_RW, &g_cache_debug, 0, "Debug level"); diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index c9cdcc5..9143166 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -45,7 +45,8 @@ FEATURE(geom_concat, "GEOM concatenation support"); static MALLOC_DEFINE(M_CONCAT, "concat_data", "GEOM_CONCAT Data"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0, "GEOM_CONCAT stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, concat, CTLFLAG_RW, 0, + "GEOM_CONCAT stuff"); static u_int g_concat_debug = 0; TUNABLE_INT("kern.geom.concat.debug", &g_concat_debug); SYSCTL_UINT(_kern_geom_concat, OID_AUTO, debug, CTLFLAG_RW, &g_concat_debug, 0, diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c index 886b993..52df914 100644 --- a/sys/geom/gate/g_gate.c +++ b/sys/geom/gate/g_gate.c @@ -59,7 +59,8 @@ FEATURE(geom_gate, "GEOM Gate module"); static MALLOC_DEFINE(M_GATE, "gg_data", "GEOM Gate Data"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, gate, CTLFLAG_RW, 0, "GEOM_GATE stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, gate, CTLFLAG_RW, 0, + "GEOM_GATE stuff"); static int g_gate_debug = 0; TUNABLE_INT("kern.geom.gate.debug", &g_gate_debug); SYSCTL_INT(_kern_geom_gate, OID_AUTO, debug, CTLFLAG_RW, &g_gate_debug, 0, diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c index 6b6c5ae..8eb486a 100644 --- a/sys/geom/geom_disk.c +++ b/sys/geom/geom_disk.c @@ -88,7 +88,8 @@ static struct g_class g_disk_class = { }; SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, disk, CTLFLAG_RW, 0, "GEOM_DISK stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, disk, CTLFLAG_RW, 0, + "GEOM_DISK stuff"); static void g_disk_init(struct g_class *mp __unused) diff --git a/sys/geom/journal/g_journal.c b/sys/geom/journal/g_journal.c index 254ba92..706d6d4 100644 --- a/sys/geom/journal/g_journal.c +++ b/sys/geom/journal/g_journal.c @@ -93,7 +93,8 @@ static u_int g_journal_accept_immediately = 64; static u_int g_journal_record_entries = GJ_RECORD_HEADER_NENTRIES; static u_int g_journal_do_optimize = 1; -SYSCTL_NODE(_kern_geom, OID_AUTO, journal, CTLFLAG_RW, 0, "GEOM_JOURNAL stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, journal, CTLFLAG_RW, 0, + "GEOM_JOURNAL stuff"); SYSCTL_INT(_kern_geom_journal, OID_AUTO, debug, CTLFLAG_RW, &g_journal_debug, 0, "Debug level"); SYSCTL_UINT(_kern_geom_journal, OID_AUTO, switch_time, CTLFLAG_RW, @@ -140,7 +141,7 @@ static u_int g_journal_cache_misses = 0; static u_int g_journal_cache_alloc_failures = 0; static u_int g_journal_cache_low = 0; -SYSCTL_NODE(_kern_geom_journal, OID_AUTO, cache, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_journal, OID_AUTO, cache, CTLFLAG_RW, 0, "GEOM_JOURNAL cache"); SYSCTL_UINT(_kern_geom_journal_cache, OID_AUTO, used, CTLFLAG_RD, &g_journal_cache_used, 0, "Number of allocated bytes"); @@ -195,7 +196,7 @@ static u_long g_journal_stats_wait_for_copy = 0; static u_long g_journal_stats_journal_full = 0; static u_long g_journal_stats_low_mem = 0; -SYSCTL_NODE(_kern_geom_journal, OID_AUTO, stats, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_journal, OID_AUTO, stats, CTLFLAG_RW, 0, "GEOM_JOURNAL statistics"); SYSCTL_ULONG(_kern_geom_journal_stats, OID_AUTO, skipped_bytes, CTLFLAG_RW, &g_journal_stats_bytes_skipped, 0, "Number of skipped bytes"); diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 6688864..1eb46de 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -51,7 +51,8 @@ FEATURE(geom_mirror, "GEOM mirroring support"); static MALLOC_DEFINE(M_MIRROR, "mirror_data", "GEOM_MIRROR Data"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0, "GEOM_MIRROR stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, mirror, CTLFLAG_RW, 0, + "GEOM_MIRROR stuff"); u_int g_mirror_debug = 0; TUNABLE_INT("kern.geom.mirror.debug", &g_mirror_debug); SYSCTL_UINT(_kern_geom_mirror, OID_AUTO, debug, CTLFLAG_RW, &g_mirror_debug, 0, diff --git a/sys/geom/mountver/g_mountver.c b/sys/geom/mountver/g_mountver.c index b2e1a63..30af511 100644 --- a/sys/geom/mountver/g_mountver.c +++ b/sys/geom/mountver/g_mountver.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW, +static SYSCTL_NODE(_kern_geom, OID_AUTO, mountver, CTLFLAG_RW, 0, "GEOM_MOUNTVER stuff"); static u_int g_mountver_debug = 0; static u_int g_mountver_check_ident = 1; diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c index 947cce0..a5b9524 100644 --- a/sys/geom/multipath/g_multipath.c +++ b/sys/geom/multipath/g_multipath.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); FEATURE(geom_multipath, "GEOM multipath support"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom, OID_AUTO, multipath, CTLFLAG_RW, 0, "GEOM_MULTIPATH tunables"); static u_int g_multipath_debug = 0; SYSCTL_UINT(_kern_geom_multipath, OID_AUTO, debug, CTLFLAG_RW, diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c index 675f06e..c28a77f 100644 --- a/sys/geom/nop/g_nop.c +++ b/sys/geom/nop/g_nop.c @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW, 0, "GEOM_NOP stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, nop, CTLFLAG_RW, 0, "GEOM_NOP stuff"); static u_int g_nop_debug = 0; SYSCTL_UINT(_kern_geom_nop, OID_AUTO, debug, CTLFLAG_RW, &g_nop_debug, 0, "Debug level"); diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index a192ded..4cc1ed5 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -106,7 +106,8 @@ struct g_part_alias_list { }; SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, part, CTLFLAG_RW, 0, "GEOM_PART stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, part, CTLFLAG_RW, 0, + "GEOM_PART stuff"); static u_int check_integrity = 1; TUNABLE_INT("kern.geom.part.check_integrity", &check_integrity); SYSCTL_UINT(_kern_geom_part, OID_AUTO, check_integrity, CTLFLAG_RW, diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c index 8e5eea2..36b7f7b 100644 --- a/sys/geom/raid/tr_raid1.c +++ b/sys/geom/raid/tr_raid1.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include "g_raid_tr_if.h" SYSCTL_DECL(_kern_geom_raid); -SYSCTL_NODE(_kern_geom_raid, OID_AUTO, raid1, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_raid, OID_AUTO, raid1, CTLFLAG_RW, 0, "RAID1 parameters"); #define RAID1_REBUILD_SLAB (1 << 20) /* One transation in a rebuild */ diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c index 23e8ba9..c827117 100644 --- a/sys/geom/raid/tr_raid1e.c +++ b/sys/geom/raid/tr_raid1e.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #define N 2 SYSCTL_DECL(_kern_geom_raid); -SYSCTL_NODE(_kern_geom_raid, OID_AUTO, raid1e, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_raid, OID_AUTO, raid1e, CTLFLAG_RW, 0, "RAID1E parameters"); #define RAID1E_REBUILD_SLAB (1 << 20) /* One transation in a rebuild */ diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index eef7c10..029d255 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -51,7 +51,8 @@ FEATURE(geom_raid3, "GEOM RAID-3 functionality"); static MALLOC_DEFINE(M_RAID3, "raid3_data", "GEOM_RAID3 Data"); SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0, "GEOM_RAID3 stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, raid3, CTLFLAG_RW, 0, + "GEOM_RAID3 stuff"); u_int g_raid3_debug = 0; TUNABLE_INT("kern.geom.raid3.debug", &g_raid3_debug); SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, debug, CTLFLAG_RW, &g_raid3_debug, 0, @@ -91,7 +92,7 @@ TUNABLE_INT("kern.geom.raid3.n4k", &g_raid3_n4k); SYSCTL_UINT(_kern_geom_raid3, OID_AUTO, n4k, CTLFLAG_RD, &g_raid3_n4k, 0, "Maximum number of 4kB allocations"); -SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_raid3, OID_AUTO, stat, CTLFLAG_RW, 0, "GEOM_RAID3 statistics"); static u_int g_raid3_parity_mismatch = 0; SYSCTL_UINT(_kern_geom_raid3_stat, OID_AUTO, parity_mismatch, CTLFLAG_RD, diff --git a/sys/geom/sched/gs_rr.c b/sys/geom/sched/gs_rr.c index 1fc8cda..6f26879 100644 --- a/sys/geom/sched/gs_rr.c +++ b/sys/geom/sched/gs_rr.c @@ -198,7 +198,7 @@ static struct g_rr_params me = { struct g_rr_params *gs_rr_me = &me; SYSCTL_DECL(_kern_geom_sched); -SYSCTL_NODE(_kern_geom_sched, OID_AUTO, rr, CTLFLAG_RW, 0, +static SYSCTL_NODE(_kern_geom_sched, OID_AUTO, rr, CTLFLAG_RW, 0, "GEOM_SCHED ROUND ROBIN stuff"); SYSCTL_INT(_kern_geom_sched_rr, OID_AUTO, units, CTLFLAG_RD, &me.units, 0, "Scheduler instances"); diff --git a/sys/geom/shsec/g_shsec.c b/sys/geom/shsec/g_shsec.c index abf0317..9f8723f 100644 --- a/sys/geom/shsec/g_shsec.c +++ b/sys/geom/shsec/g_shsec.c @@ -68,7 +68,8 @@ struct g_class g_shsec_class = { }; SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0, "GEOM_SHSEC stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, shsec, CTLFLAG_RW, 0, + "GEOM_SHSEC stuff"); static u_int g_shsec_debug = 0; TUNABLE_INT("kern.geom.shsec.debug", &g_shsec_debug); SYSCTL_UINT(_kern_geom_shsec, OID_AUTO, debug, CTLFLAG_RW, &g_shsec_debug, 0, diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c index a18f303..575ec5f 100644 --- a/sys/geom/stripe/g_stripe.c +++ b/sys/geom/stripe/g_stripe.c @@ -68,7 +68,8 @@ struct g_class g_stripe_class = { }; SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, stripe, CTLFLAG_RW, 0, "GEOM_STRIPE stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, stripe, CTLFLAG_RW, 0, + "GEOM_STRIPE stuff"); static u_int g_stripe_debug = 0; TUNABLE_INT("kern.geom.stripe.debug", &g_stripe_debug); SYSCTL_UINT(_kern_geom_stripe, OID_AUTO, debug, CTLFLAG_RW, &g_stripe_debug, 0, diff --git a/sys/geom/vinum/geom_vinum.c b/sys/geom/vinum/geom_vinum.c index ab4d1a4..15a62a1 100644 --- a/sys/geom/vinum/geom_vinum.c +++ b/sys/geom/vinum/geom_vinum.c @@ -47,7 +47,8 @@ __FBSDID("$FreeBSD$"); #include <geom/vinum/geom_vinum_raid5.h> SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0, "GEOM_VINUM stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, vinum, CTLFLAG_RW, 0, + "GEOM_VINUM stuff"); u_int g_vinum_debug = 0; TUNABLE_INT("kern.geom.vinum.debug", &g_vinum_debug); SYSCTL_UINT(_kern_geom_vinum, OID_AUTO, debug, CTLFLAG_RW, &g_vinum_debug, 0, diff --git a/sys/geom/virstor/g_virstor.c b/sys/geom/virstor/g_virstor.c index e9bee5c..a180ef2 100644 --- a/sys/geom/virstor/g_virstor.c +++ b/sys/geom/virstor/g_virstor.c @@ -80,7 +80,8 @@ struct g_class g_virstor_class = { /* Declare sysctl's and loader tunables */ SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, virstor, CTLFLAG_RW, 0, "GEOM_GVIRSTOR information"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, virstor, CTLFLAG_RW, 0, + "GEOM_GVIRSTOR information"); static u_int g_virstor_debug = 2; /* XXX: lower to 2 when released to public */ TUNABLE_INT("kern.geom.virstor.debug", &g_virstor_debug); diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c index b8899e7..1c2c54f 100644 --- a/sys/geom/zero/g_zero.c +++ b/sys/geom/zero/g_zero.c @@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$"); #define G_ZERO_CLASS_NAME "ZERO" SYSCTL_DECL(_kern_geom); -SYSCTL_NODE(_kern_geom, OID_AUTO, zero, CTLFLAG_RW, 0, "GEOM_ZERO stuff"); +static SYSCTL_NODE(_kern_geom, OID_AUTO, zero, CTLFLAG_RW, 0, + "GEOM_ZERO stuff"); static int g_zero_clear = 1; SYSCTL_INT(_kern_geom_zero, OID_AUTO, clear, CTLFLAG_RW, &g_zero_clear, 0, "Clear read data buffer"); |