svn commit: r365222 - head/sys/kern
Mateusz Guzik
mjg at FreeBSD.org
Tue Sep 1 22:12:46 UTC 2020
Author: mjg
Date: Tue Sep 1 22:12:32 2020
New Revision: 365222
URL: https://svnweb.freebsd.org/changeset/base/365222
Log:
kern: clean up empty lines in .c and .h files
Modified:
head/sys/kern/imgact_elf.c
head/sys/kern/init_main.c
head/sys/kern/kern_acct.c
head/sys/kern/kern_alq.c
head/sys/kern/kern_clock.c
head/sys/kern/kern_conf.c
head/sys/kern/kern_cons.c
head/sys/kern/kern_cpu.c
head/sys/kern/kern_cpuset.c
head/sys/kern/kern_environment.c
head/sys/kern/kern_et.c
head/sys/kern/kern_event.c
head/sys/kern/kern_fail.c
head/sys/kern/kern_fork.c
head/sys/kern/kern_jail.c
head/sys/kern/kern_ktr.c
head/sys/kern/kern_linker.c
head/sys/kern/kern_lock.c
head/sys/kern/kern_lockf.c
head/sys/kern/kern_malloc.c
head/sys/kern/kern_mbuf.c
head/sys/kern/kern_module.c
head/sys/kern/kern_ntptime.c
head/sys/kern/kern_pmc.c
head/sys/kern/kern_proc.c
head/sys/kern/kern_prot.c
head/sys/kern/kern_racct.c
head/sys/kern/kern_rctl.c
head/sys/kern/kern_resource.c
head/sys/kern/kern_sendfile.c
head/sys/kern/kern_sig.c
head/sys/kern/kern_sysctl.c
head/sys/kern/kern_time.c
head/sys/kern/kern_timeout.c
head/sys/kern/kern_xxx.c
head/sys/kern/link_elf.c
head/sys/kern/link_elf_obj.c
head/sys/kern/posix4_mib.c
head/sys/kern/sched_4bsd.c
head/sys/kern/subr_blist.c
head/sys/kern/subr_bufring.c
head/sys/kern/subr_bus.c
head/sys/kern/subr_busdma_bufalloc.c
head/sys/kern/subr_counter.c
head/sys/kern/subr_csan.c
head/sys/kern/subr_devmap.c
head/sys/kern/subr_filter.c
head/sys/kern/subr_intr.c
head/sys/kern/subr_kobj.c
head/sys/kern/subr_lock.c
head/sys/kern/subr_log.c
head/sys/kern/subr_mchain.c
head/sys/kern/subr_module.c
head/sys/kern/subr_msgbuf.c
head/sys/kern/subr_power.c
head/sys/kern/subr_scanf.c
head/sys/kern/subr_smp.c
head/sys/kern/subr_terminal.c
head/sys/kern/subr_turnstile.c
head/sys/kern/subr_uio.c
head/sys/kern/subr_unit.c
head/sys/kern/subr_witness.c
head/sys/kern/sys_generic.c
head/sys/kern/sys_pipe.c
head/sys/kern/sys_socket.c
head/sys/kern/sysv_msg.c
head/sys/kern/uipc_mbuf.c
head/sys/kern/uipc_mqueue.c
head/sys/kern/uipc_sem.c
head/sys/kern/uipc_shm.c
head/sys/kern/uipc_sockbuf.c
head/sys/kern/uipc_socket.c
head/sys/kern/uipc_usrreq.c
head/sys/kern/vfs_bio.c
head/sys/kern/vfs_export.c
head/sys/kern/vfs_subr.c
Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/imgact_elf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -908,7 +908,7 @@ __elfN(enforce_limits)(struct image_params *imgp, cons
}
total_size += seg_size;
}
-
+
if (data_addr == 0 && data_size == 0) {
data_addr = text_addr;
data_size = text_size;
Modified: head/sys/kern/init_main.c
==============================================================================
--- head/sys/kern/init_main.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/init_main.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -277,7 +277,6 @@ restart:
* Perform each task, and continue on to the next task.
*/
for (sipp = sysinit; sipp < sysinit_end; sipp++) {
-
if ((*sipp)->subsystem == SI_SUB_DUMMY)
continue; /* skip dummy task(s)*/
@@ -723,7 +722,7 @@ start_init(void *dummy)
freeenv(var);
}
free_init_path = tmp_init_path = strdup(init_path, M_TEMP);
-
+
while ((path = strsep(&tmp_init_path, ":")) != NULL) {
if (bootverbose)
printf("start_init: trying %s\n", path);
Modified: head/sys/kern/kern_acct.c
==============================================================================
--- head/sys/kern/kern_acct.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_acct.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -635,7 +635,6 @@ acct_thread(void *dummy)
/* Loop until we are asked to exit. */
while (!(acct_state & ACCT_EXITREQ)) {
-
/* Perform our periodic checks. */
acctwatch();
Modified: head/sys/kern/kern_alq.c
==============================================================================
--- head/sys/kern/kern_alq.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_alq.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -923,7 +923,7 @@ static int
alq_load_handler(module_t mod, int what, void *arg)
{
int ret;
-
+
ret = 0;
switch (what) {
Modified: head/sys/kern/kern_clock.c
==============================================================================
--- head/sys/kern/kern_clock.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_clock.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -229,7 +229,6 @@ deadlres_td_sleep_q(struct proc *p, struct thread *td,
slptype = sleepq_type(wchan);
if ((slptype == SLEEPQ_SX || slptype == SLEEPQ_LK) &&
tticks > slpticks) {
-
/*
* Accordingly with provided thresholds, this thread is stuck
* for too long on a sleepqueue.
Modified: head/sys/kern/kern_conf.c
==============================================================================
--- head/sys/kern/kern_conf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_conf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -664,7 +664,7 @@ prep_cdevsw(struct cdevsw *devsw, int flags)
devsw->d_dump = dead_dump;
devsw->d_kqfilter = dead_kqfilter;
}
-
+
if (devsw->d_flags & D_NEEDGIANT) {
printf("WARNING: Device \"%s\" is Giant locked and may be "
"deleted before FreeBSD 13.0.\n",
@@ -1399,7 +1399,7 @@ clone_cleanup(struct clonedevs **cdp)
struct cdev *dev;
struct cdev_priv *cp;
struct clonedevs *cd;
-
+
cd = *cdp;
if (cd == NULL)
return;
Modified: head/sys/kern/kern_cons.c
==============================================================================
--- head/sys/kern/kern_cons.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_cons.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -779,4 +779,3 @@ vty_set_preferred(unsigned vty)
vty_prefer &= ~VTY_VT;
#endif
}
-
Modified: head/sys/kern/kern_cpu.c
==============================================================================
--- head/sys/kern/kern_cpu.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_cpu.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -695,7 +695,6 @@ cf_levels_method(device_t dev, struct cf_level *levels
/* Finally, output the list of levels. */
i = 0;
TAILQ_FOREACH(lev, &sc->all_levels, link) {
-
/* Skip levels that have a frequency that is too low. */
if (lev->total_set.freq < cf_lowest_freq) {
sc->all_count--;
Modified: head/sys/kern/kern_cpuset.c
==============================================================================
--- head/sys/kern/kern_cpuset.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_cpuset.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -488,7 +488,7 @@ _domainset_create(struct domainset *domain, struct dom
else
uma_zfree(domainset_zone, domain);
return (ndomain);
-
+
}
/*
@@ -1893,7 +1893,6 @@ kern_cpuset_setaffinity(struct thread *td, cpulevel_t
error = EINVAL;
goto out;
}
-
}
switch (level) {
case CPU_LEVEL_ROOT:
@@ -2148,7 +2147,6 @@ kern_cpuset_setdomain(struct thread *td, cpulevel_t le
error = EINVAL;
goto out;
}
-
}
DOMAINSET_COPY(mask, &domain.ds_mask);
domain.ds_policy = policy;
Modified: head/sys/kern/kern_environment.c
==============================================================================
--- head/sys/kern/kern_environment.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_environment.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -696,7 +696,6 @@ getenv_array(const char *name, void *pdata, int size,
n = 0;
for (ptr = buf; *ptr != 0; ) {
-
value = strtoq(ptr, &end, 0);
/* check if signed numbers are allowed */
Modified: head/sys/kern/kern_et.c
==============================================================================
--- head/sys/kern/kern_et.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_et.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -268,4 +268,3 @@ sysctl_kern_eventtimer_choice(SYSCTL_HANDLER_ARGS)
SYSCTL_PROC(_kern_eventtimer, OID_AUTO, choice,
CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
0, 0, sysctl_kern_eventtimer_choice, "A", "Present event timers");
-
Modified: head/sys/kern/kern_event.c
==============================================================================
--- head/sys/kern/kern_event.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_event.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1561,7 +1561,7 @@ findkn:
goto done;
}
}
-
+
if (kev->flags & EV_DELETE) {
kn_enter_flux(kn);
KQ_UNLOCK(kq);
Modified: head/sys/kern/kern_fail.c
==============================================================================
--- head/sys/kern/kern_fail.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_fail.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -563,7 +563,6 @@ fail_point_eval_nontrivial(struct fail_point *fp, int
goto abort;
TAILQ_FOREACH(ent, &fp_setting->fp_entry_queue, fe_entries) {
-
if (ent->fe_stale)
continue;
Modified: head/sys/kern/kern_fork.c
==============================================================================
--- head/sys/kern/kern_fork.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_fork.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -704,7 +704,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct
procdesc_finit(p2->p_procdesc, fp_procdesc);
fdrop(fp_procdesc, td);
}
-
+
/*
* Speculative check for PTRACE_FORK. PTRACE_FORK is not
* synced with forks in progress so it is OK if we miss it
Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_jail.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -3173,7 +3173,6 @@ prison_priv_check(struct ucred *cred, int priv)
#endif /* VIMAGE */
switch (priv) {
-
/*
* Allow ktrace privileges for root in jail.
*/
Modified: head/sys/kern/kern_ktr.c
==============================================================================
--- head/sys/kern/kern_ktr.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_ktr.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -419,7 +419,7 @@ static int db_mach_vtrace(void);
DB_SHOW_COMMAND(ktr, db_ktr_all)
{
-
+
tstate.cur = (ktr_idx - 1) % ktr_entries;
tstate.first = -1;
db_ktr_verbose = 0;
Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_linker.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -480,7 +480,6 @@ linker_load_file(const char *filename, linker_file_t *
* the module was not found.
*/
if (foundfile) {
-
/*
* If the file type has not been recognized by the last try
* printout a message before to fail.
@@ -668,7 +667,6 @@ linker_file_unload(linker_file_t file, int flags)
MOD_SLOCK;
for (mod = TAILQ_FIRST(&file->modules); mod;
mod = module_getfnext(mod)) {
-
error = module_quiesce(mod);
if (error != 0 && flags != LINKER_UNLOAD_FORCE) {
KLD_DPF(FILE, ("linker_file_unload: module %s"
@@ -2044,7 +2042,6 @@ linker_hwpmc_list_objects(void)
M_LINKER, M_WAITOK | M_ZERO);
i = 0;
TAILQ_FOREACH(lf, &linker_files, link) {
-
/* Save the info for this linker file. */
kobase[i].pm_file = lf->filename;
kobase[i].pm_address = (uintptr_t)lf->address;
Modified: head/sys/kern/kern_lock.c
==============================================================================
--- head/sys/kern/kern_lock.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_lock.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -364,7 +364,6 @@ retry_sleepq:
}
} else {
-
/*
* Exclusive waiters sleeping with LK_SLEEPFAIL on
* and using interruptible sleeps/timeout may have
@@ -1186,7 +1185,6 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_i
queue = SQ_SHARED_QUEUE;
}
} else {
-
/*
* Exclusive waiters sleeping with LK_SLEEPFAIL
* on and using interruptible sleeps/timeout
@@ -1486,7 +1484,6 @@ __lockmgr_args(struct lock *lk, u_int flags, struct lo
queue = SQ_EXCLUSIVE_QUEUE;
v &= ~LK_EXCLUSIVE_WAITERS;
} else {
-
/*
* Exclusive waiters sleeping with
* LK_SLEEPFAIL on and using
Modified: head/sys/kern/kern_lockf.c
==============================================================================
--- head/sys/kern/kern_lockf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_lockf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -441,7 +441,6 @@ lf_advlockasync(struct vop_advlockasync_args *ap, stru
* Convert the flock structure into a start and end.
*/
switch (fl->l_whence) {
-
case SEEK_SET:
case SEEK_CUR:
/*
@@ -2440,7 +2439,7 @@ graph_free_vertex(struct owner_graph *g, struct owner_
int i;
sx_assert(&lf_owner_graph_lock, SX_XLOCKED);
-
+
KASSERT(LIST_EMPTY(&v->v_outedges), ("Freeing vertex with edges"));
KASSERT(LIST_EMPTY(&v->v_inedges), ("Freeing vertex with edges"));
Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_malloc.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1108,7 +1108,6 @@ mallocinit(void *dummy)
}
for (;i <= size; i+= KMEM_ZBASE)
kmemsize[i >> KMEM_ZSHIFT] = indx;
-
}
}
SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_SECOND, mallocinit, NULL);
@@ -1260,7 +1259,6 @@ sysctl_kern_malloc_stats(SYSCTL_HANDLER_ARGS)
for (; i < MAXCPU; i++) {
(void)sbuf_bcat(&sbuf, &zeromts, sizeof(zeromts));
}
-
}
mtx_unlock(&malloc_mtx);
error = sbuf_finish(&sbuf);
Modified: head/sys/kern/kern_mbuf.c
==============================================================================
--- head/sys/kern/kern_mbuf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_mbuf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1427,7 +1427,6 @@ m_getm2(struct mbuf *m, int len, int how, short type,
if (len > MCLBYTES) {
mb = m_getjcl(M_NOWAIT, type, (flags & M_PKTHDR),
MJUMPAGESIZE);
-
}
if (mb == NULL) {
if (len >= MINCLSIZE)
Modified: head/sys/kern/kern_module.c
==============================================================================
--- head/sys/kern/kern_module.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_module.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -200,7 +200,7 @@ module_release(module_t mod)
panic("module_release: bad reference count");
MOD_DPF(REFS, ("module_release: before, refs=%d\n", mod->refs));
-
+
mod->refs--;
if (mod->refs == 0) {
TAILQ_REMOVE(&modules, mod, link);
Modified: head/sys/kern/kern_ntptime.c
==============================================================================
--- head/sys/kern/kern_ntptime.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_ntptime.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -514,7 +514,6 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
* is always monotonic.
*/
switch (time_state) {
-
/*
* No warning.
*/
@@ -588,7 +587,7 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
time_adj = ftemp;
L_SUB(time_offset, ftemp);
L_ADD(time_adj, time_freq);
-
+
/*
* Apply any correction from adjtime(2). If more than one second
* off we slew at a rate of 5ms/s (5000 PPM) else 500us/s (500PPM)
Modified: head/sys/kern/kern_pmc.c
==============================================================================
--- head/sys/kern/kern_pmc.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_pmc.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -364,4 +364,3 @@ init_hwpmc(void *dummy __unused)
}
SYSINIT(hwpmc, SI_SUB_KDTRACE, SI_ORDER_FIRST, init_hwpmc, NULL);
-
Modified: head/sys/kern/kern_proc.c
==============================================================================
--- head/sys/kern/kern_proc.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_proc.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1613,7 +1613,6 @@ sysctl_kern_proc_iterate(struct proc *p, void *origarg
* do by session.
*/
switch (oid_number) {
-
case KERN_PROC_GID:
if (p->p_ucred->cr_gid != (gid_t)name[0])
goto skip;
@@ -1667,7 +1666,6 @@ sysctl_kern_proc_iterate(struct proc *p, void *origarg
default:
break;
-
}
error = sysctl_out_proc(p, req, flags);
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
Modified: head/sys/kern/kern_prot.c
==============================================================================
--- head/sys/kern/kern_prot.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_prot.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1381,7 +1381,7 @@ int
cr_canseeothergids(struct ucred *u1, struct ucred *u2)
{
int i, match;
-
+
if (!see_other_gids) {
match = 0;
for (i = 0; i < u1->cr_ngroups; i++) {
@@ -2227,7 +2227,7 @@ crsetgroups_locked(struct ucred *cr, int ngrp, gid_t *
int i;
int j;
gid_t g;
-
+
KASSERT(cr->cr_agroups >= ngrp, ("cr_ngroups is too small"));
bcopy(groups, cr->cr_groups, ngrp * sizeof(gid_t));
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_racct.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -528,7 +528,7 @@ racct_adjust_resource(struct racct *racct, int resourc
("%s: resource %d usage < 0", __func__, resource));
racct->r_resources[resource] = 0;
}
-
+
/*
* There are some cases where the racct %cpu resource would grow
* beyond 100% per core. For example in racct_proc_exit() we add
Modified: head/sys/kern/kern_rctl.c
==============================================================================
--- head/sys/kern/kern_rctl.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_rctl.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1063,16 +1063,16 @@ static void
rctl_rule_free(void *context, int pending)
{
struct rctl_rule *rule;
-
+
rule = (struct rctl_rule *)context;
ASSERT_RACCT_ENABLED();
KASSERT(rule->rr_refcount == 0, ("rule->rr_refcount != 0"));
-
+
/*
* We don't need locking here; rule is guaranteed to be inaccessible.
*/
-
+
rctl_rule_release_subject(rule);
uma_zfree(rctl_rule_zone, rule);
}
@@ -2021,7 +2021,7 @@ again:
rulecnt--;
}
}
-
+
LIST_FOREACH(link, &newuip->ui_racct->r_rule_links, rrl_next) {
if (newlink == NULL)
goto goaround;
@@ -2208,35 +2208,35 @@ rctl_init(void)
int
sys_rctl_get_racct(struct thread *td, struct rctl_get_racct_args *uap)
{
-
+
return (ENOSYS);
}
int
sys_rctl_get_rules(struct thread *td, struct rctl_get_rules_args *uap)
{
-
+
return (ENOSYS);
}
int
sys_rctl_get_limits(struct thread *td, struct rctl_get_limits_args *uap)
{
-
+
return (ENOSYS);
}
int
sys_rctl_add_rule(struct thread *td, struct rctl_add_rule_args *uap)
{
-
+
return (ENOSYS);
}
int
sys_rctl_remove_rule(struct thread *td, struct rctl_remove_rule_args *uap)
{
-
+
return (ENOSYS);
}
Modified: head/sys/kern/kern_resource.c
==============================================================================
--- head/sys/kern/kern_resource.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_resource.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -105,7 +105,6 @@ kern_getpriority(struct thread *td, int which, int who
error = 0;
low = PRIO_MAX + 1;
switch (which) {
-
case PRIO_PROCESS:
if (who == 0)
low = td->td_proc->p_nice;
@@ -691,7 +690,6 @@ kern_proc_setrlimit(struct thread *td, struct proc *p,
alimp = &newlim->pl_rlimit[which];
switch (which) {
-
case RLIMIT_CPU:
if (limp->rlim_cur != RLIM_INFINITY &&
p->p_cpulimit == RLIM_INFINITY)
Modified: head/sys/kern/kern_sendfile.c
==============================================================================
--- head/sys/kern/kern_sendfile.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_sendfile.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1313,7 +1313,7 @@ out:
int
sys_sendfile(struct thread *td, struct sendfile_args *uap)
{
-
+
return (sendfile(td, uap, 0));
}
Modified: head/sys/kern/kern_sig.c
==============================================================================
--- head/sys/kern/kern_sig.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_sig.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -2961,7 +2961,6 @@ issignal(struct thread *td)
* to clear it from the pending mask.
*/
switch ((intptr_t)p->p_sigacts->ps_sigact[_SIG_IDX(sig)]) {
-
case (intptr_t)SIG_DFL:
/*
* Don't take default actions on system processes.
Modified: head/sys/kern/kern_sysctl.c
==============================================================================
--- head/sys/kern/kern_sysctl.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_sysctl.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -970,7 +970,6 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list *
SYSCTL_ASSERT_LOCKED();
SLIST_FOREACH(oidp, l, oid_link) {
-
for (k=0; k<i; k++)
printf(" ");
@@ -1007,7 +1006,6 @@ sysctl_sysctl_debug_dump_node(struct sysctl_oid_list *
case CTLTYPE_OPAQUE: printf(" Opaque/struct\n"); break;
default: printf("\n");
}
-
}
}
Modified: head/sys/kern/kern_time.c
==============================================================================
--- head/sys/kern/kern_time.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_time.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1212,10 +1212,10 @@ kern_ktimer_create(struct thread *td, clockid_t clock_
!_SIG_VALID(evp->sigev_signo))
return (EINVAL);
}
-
+
if (p->p_itimers == NULL)
itimers_alloc(p);
-
+
it = uma_zalloc(itimer_zone, M_WAITOK);
it->it_flags = 0;
it->it_usecount = 0;
@@ -1491,7 +1491,7 @@ static int
realtimer_delete(struct itimer *it)
{
mtx_assert(&it->it_mtx, MA_OWNED);
-
+
/*
* clear timer's value and interval to tell realtimer_expire
* to not rearm the timer.
@@ -1545,7 +1545,7 @@ realtimer_settime(struct itimer *it, int flags,
} else {
timespecclear(&val.it_interval);
}
-
+
if (ovalue != NULL)
realtimer_gettime(it, ovalue);
Modified: head/sys/kern/kern_timeout.c
==============================================================================
--- head/sys/kern/kern_timeout.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_timeout.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -654,7 +654,7 @@ softclock_call_cc(struct callout *c, struct callout_cp
c_arg = c->c_arg;
c_iflags = c->c_iflags;
c->c_iflags &= ~CALLOUT_PENDING;
-
+
cc_exec_curr(cc, direct) = c;
cc_exec_last_func(cc, direct) = c_func;
cc_exec_last_arg(cc, direct) = c_arg;
Modified: head/sys/kern/kern_xxx.c
==============================================================================
--- head/sys/kern/kern_xxx.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/kern_xxx.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -173,7 +173,6 @@ ogetkerninfo(struct thread *td, struct ogetkerninfo_ar
u_int needed = 0;
switch (uap->op & 0xff00) {
-
case KINFO_RT:
name[0] = CTL_NET;
name[1] = PF_ROUTE;
Modified: head/sys/kern/link_elf.c
==============================================================================
--- head/sys/kern/link_elf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/link_elf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -213,7 +213,6 @@ elf_set_add(struct elf_set_head *list, Elf_Addr start,
set->es_base = base;
TAILQ_FOREACH(iter, list, es_link) {
-
KASSERT((set->es_start < iter->es_start && set->es_stop < iter->es_stop) ||
(set->es_start > iter->es_start && set->es_stop > iter->es_stop),
("linker sets intersection: to insert: 0x%jx-0x%jx; inserted: 0x%jx-0x%jx",
Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/link_elf_obj.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1457,7 +1457,7 @@ link_elf_each_function_name(linker_file_t file,
elf_file_t ef = (elf_file_t)file;
const Elf_Sym *symp;
int i, error;
-
+
/* Exhaustive search */
for (i = 0, symp = ef->ddbsymtab; i < ef->ddbsymcnt; i++, symp++) {
if (symp->st_value != 0 &&
Modified: head/sys/kern/posix4_mib.c
==============================================================================
--- head/sys/kern/posix4_mib.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/posix4_mib.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -176,4 +176,3 @@ p31b_set_standard(void *dummy)
SYSINIT(p31b_set_standard, SI_SUB_P1003_1B, SI_ORDER_ANY, p31b_set_standard,
NULL);
-
Modified: head/sys/kern/sched_4bsd.c
==============================================================================
--- head/sys/kern/sched_4bsd.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/sched_4bsd.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -1262,7 +1262,7 @@ sched_pickcpu(struct thread *td)
CPU_FOREACH(cpu) {
if (!THREAD_CAN_SCHED(td, cpu))
continue;
-
+
if (best == NOCPU)
best = cpu;
else if (runq_length[cpu] < runq_length[best])
@@ -1311,7 +1311,6 @@ sched_add(struct thread *td, int flags)
td->td_lock = &sched_lock;
else
thread_lock_set(td, &sched_lock);
-
}
TD_SET_RUNQ(td);
@@ -1629,7 +1628,7 @@ sched_pctcpu_delta(struct thread *td)
u_int
sched_estcpu(struct thread *td)
{
-
+
return (td_get_sched(td)->ts_estcpu);
}
Modified: head/sys/kern/subr_blist.c
==============================================================================
--- head/sys/kern/subr_blist.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_blist.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -650,7 +650,7 @@ blst_next_leaf_alloc(blmeta_t *scan, daddr_t start, in
}
}
}
-
+
/*
* 'scan' is the last leaf that provides blocks. Clear from 1 to
* BLIST_RADIX bits to represent the allocation of those last blocks.
Modified: head/sys/kern/subr_bufring.c
==============================================================================
--- head/sys/kern/subr_bufring.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_bufring.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -42,7 +42,7 @@ buf_ring_alloc(int count, struct malloc_type *type, in
struct buf_ring *br;
KASSERT(powerof2(count), ("buf ring must be size power of 2"));
-
+
br = malloc(sizeof(struct buf_ring) + count*sizeof(caddr_t),
type, flags|M_ZERO);
if (br == NULL)
Modified: head/sys/kern/subr_bus.c
==============================================================================
--- head/sys/kern/subr_bus.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_bus.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -169,7 +169,6 @@ static bool device_frozen;
static int bus_debug = 1;
SYSCTL_INT(_debug, OID_AUTO, bus_debug, CTLFLAG_RWTUN, &bus_debug, 0,
"Bus debug level");
-
#define PDEBUG(a) if (bus_debug) {printf("%s:%d: ", __func__, __LINE__), printf a; printf("\n");}
#define DEVICENAME(d) ((d)? device_get_name(d): "no device")
@@ -1921,7 +1920,7 @@ device_delete_child(device_t dev, device_t child)
/* detach parent before deleting children, if any */
if ((error = device_detach(child)) != 0)
return (error);
-
+
/* remove children second */
while ((grandchild = TAILQ_FIRST(&child->children)) != NULL) {
error = device_delete_child(child, grandchild);
Modified: head/sys/kern/subr_busdma_bufalloc.c
==============================================================================
--- head/sys/kern/subr_busdma_bufalloc.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_busdma_bufalloc.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -171,4 +171,3 @@ busdma_bufalloc_free_uncacheable(void *item, vm_size_t
kmem_free((vm_offset_t)item, size);
}
-
Modified: head/sys/kern/subr_counter.c
==============================================================================
--- head/sys/kern/subr_counter.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_counter.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -113,7 +113,7 @@ sysctl_handle_counter_u64_array(SYSCTL_HANDLER_ARGS)
*/
for (int i = 0; i < arg2; i++)
counter_u64_zero(((counter_u64_t *)arg1)[i]);
-
+
return (0);
}
Modified: head/sys/kern/subr_csan.c
==============================================================================
--- head/sys/kern/subr_csan.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_csan.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -878,4 +878,3 @@ CSAN_BUS_SET_FUNC(multi_stream, 8, uint64_t)
CSAN_BUS_SET_FUNC(region_stream, 8, uint64_t)
#endif
#endif
-
Modified: head/sys/kern/subr_devmap.c
==============================================================================
--- head/sys/kern/subr_devmap.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_devmap.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -348,4 +348,3 @@ DB_SHOW_COMMAND(devmap, db_show_devmap)
}
#endif /* DDB */
-
Modified: head/sys/kern/subr_filter.c
==============================================================================
--- head/sys/kern/subr_filter.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_filter.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -76,7 +76,7 @@ setup_time_filter(struct time_filter *tf, int fil_type
{
uint64_t set_val;
int i;
-
+
/*
* You must specify either a MIN or MAX filter,
* though its up to the user to use the correct
@@ -107,7 +107,7 @@ setup_time_filter_small(struct time_filter_small *tf,
{
uint32_t set_val;
int i;
-
+
/*
* You must specify either a MIN or MAX filter,
* though its up to the user to use the correct
@@ -333,7 +333,6 @@ tick_filter_clock(struct time_filter *tf, uint32_t now
tf->entries[i].value = tf->entries[(i+1)].value;
tf->entries[i].time_up = tf->entries[(i+1)].time_up;
}
-
}
}
@@ -365,7 +364,6 @@ tick_filter_clock_small(struct time_filter_small *tf,
tf->entries[i].value = tf->entries[(i+1)].value;
tf->entries[i].time_up = tf->entries[(i+1)].time_up;
}
-
}
}
@@ -373,7 +371,7 @@ uint32_t
apply_filter_min(struct time_filter *tf, uint64_t value, uint32_t now)
{
int i, j;
-
+
if (value <= tf->entries[0].value) {
/* Zap them all */
for(i=0; i<NUM_FILTER_ENTRIES; i++) {
@@ -400,7 +398,7 @@ apply_filter_min_small(struct time_filter_small *tf,
uint32_t value, uint32_t now)
{
int i, j;
-
+
if (value <= tf->entries[0].value) {
/* Zap them all */
for(i=0; i<NUM_FILTER_ENTRIES; i++) {
@@ -426,7 +424,7 @@ uint32_t
apply_filter_max(struct time_filter *tf, uint64_t value, uint32_t now)
{
int i, j;
-
+
if (value >= tf->entries[0].value) {
/* Zap them all */
for(i=0; i<NUM_FILTER_ENTRIES; i++) {
@@ -453,7 +451,7 @@ apply_filter_max_small(struct time_filter_small *tf,
uint32_t value, uint32_t now)
{
int i, j;
-
+
if (value >= tf->entries[0].value) {
/* Zap them all */
for(i=0; i<NUM_FILTER_ENTRIES; i++) {
Modified: head/sys/kern/subr_intr.c
==============================================================================
--- head/sys/kern/subr_intr.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_intr.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -936,7 +936,6 @@ intr_resolve_irq(device_t dev, intptr_t xref, struct i
("%s: Found a non-PIC controller: %s", __func__,
device_get_name(pic->pic_dev)));
return (PIC_MAP_INTR(pic->pic_dev, data, isrc));
-
}
}
@@ -1318,7 +1317,6 @@ intr_alloc_msi(device_t pci, device_t child, intptr_t
msi-> isrc = isrc[i];
irqs[i] = intr_map_irq(pic->pic_dev, xref,
(struct intr_map_data *)msi);
-
}
free(isrc, M_INTRNG);
Modified: head/sys/kern/subr_kobj.c
==============================================================================
--- head/sys/kern/subr_kobj.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_kobj.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -253,7 +253,7 @@ kobj_class_free(kobj_class_t cls)
ops = cls->ops;
cls->ops = NULL;
}
-
+
KOBJ_UNLOCK();
if (ops)
Modified: head/sys/kern/subr_lock.c
==============================================================================
--- head/sys/kern/subr_lock.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_lock.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -548,7 +548,6 @@ lock_profile_lookup(struct lock_object *lo, int spin,
if (lp->line == line && lp->file == p &&
lp->name == lo->lo_name)
return (lp);
-
}
lp = SLIST_FIRST(&type->lpt_lpalloc);
if (lp == NULL) {
Modified: head/sys/kern/subr_log.c
==============================================================================
--- head/sys/kern/subr_log.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_log.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -258,7 +258,6 @@ logioctl(struct cdev *dev, u_long com, caddr_t data, i
{
switch (com) {
-
/* return number of characters immediately available */
case FIONREAD:
*(int *)data = msgbuf_getcount(msgbufp);
Modified: head/sys/kern/subr_mchain.c
==============================================================================
--- head/sys/kern/subr_mchain.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_mchain.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -473,7 +473,7 @@ md_get_mem(struct mdchain *mdp, caddr_t target, int si
int error;
u_int count;
u_char *s;
-
+
while (size > 0) {
if (m == NULL) {
MBERROR("incomplete copy\n");
Modified: head/sys/kern/subr_module.c
==============================================================================
--- head/sys/kern/subr_module.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_module.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -54,7 +54,6 @@ preload_search_by_name(const char *name)
int next;
if (preload_metadata != NULL) {
-
curp = preload_metadata;
for (;;) {
hdr = (uint32_t *)curp;
@@ -86,7 +85,6 @@ preload_search_by_type(const char *type)
int next;
if (preload_metadata != NULL) {
-
curp = preload_metadata;
lname = NULL;
for (;;) {
@@ -123,7 +121,6 @@ preload_search_next_name(caddr_t base)
int next;
if (preload_metadata != NULL) {
-
/* Pick up where we left off last time */
if (base) {
/* skip to next field */
@@ -184,7 +181,7 @@ preload_search_info(caddr_t mod, int inf)
if (hdr[0] == type)
break;
}
-
+
/*
* Attribute match? Return pointer to data.
* Consumer may safely assume that size value precedes
@@ -216,7 +213,6 @@ preload_delete_name(const char *name)
sz = 0;
if (preload_metadata != NULL) {
-
clearing = 0;
curp = preload_metadata;
for (;;) {
@@ -284,7 +280,6 @@ preload_bootstrap_relocate(vm_offset_t offset)
int next;
if (preload_metadata != NULL) {
-
curp = preload_metadata;
for (;;) {
hdr = (uint32_t *)curp;
Modified: head/sys/kern/subr_msgbuf.c
==============================================================================
--- head/sys/kern/subr_msgbuf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_msgbuf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -218,7 +218,6 @@ msgbuf_addstr(struct msgbuf *mbp, int pri, const char
* insert a newline before this string.
*/
if (mbp->msg_lastpri != pri && (mbp->msg_flags & MSGBUF_NEEDNL) != 0) {
-
msgbuf_do_addchar(mbp, &seq, '\n');
mbp->msg_flags &= ~MSGBUF_NEEDNL;
}
@@ -239,7 +238,6 @@ msgbuf_addstr(struct msgbuf *mbp, int pri, const char
if (msgbuf_show_timestamp && needtime == 1 &&
(mbp->msg_flags & MSGBUF_NEEDNL) == 0) {
-
snprintf(buf, sizeof(buf), "[%jd] ",
(intmax_t)time_uptime);
for (j = 0; buf[j] != '\0'; j++)
Modified: head/sys/kern/subr_power.c
==============================================================================
--- head/sys/kern/subr_power.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_power.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -121,4 +121,3 @@ power_profile_set_state(int state)
if (changed)
EVENTHANDLER_INVOKE(power_profile_change, 0);
}
-
Modified: head/sys/kern/subr_scanf.c
==============================================================================
--- head/sys/kern/subr_scanf.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_scanf.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -97,7 +97,7 @@ sscanf(const char *ibuf, const char *fmt, ...)
{
va_list ap;
int ret;
-
+
va_start(ap, fmt);
ret = vsscanf(ibuf, fmt, ap);
va_end(ap);
@@ -128,7 +128,7 @@ vsscanf(const char *inp, char const *fmt0, va_list ap)
{ 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
inr = strlen(inp);
-
+
nassigned = 0;
nconversions = 0;
nread = 0;
@@ -309,7 +309,6 @@ literal:
* Do the conversion.
*/
switch (c) {
-
case CT_CHAR:
/* scan arbitrary characters (sets NOSKIP) */
if (width == 0)
@@ -434,7 +433,6 @@ literal:
* if we accept it as a part of number.
*/
switch (c) {
-
/*
* The digit 0 is always legal, but is
* special. For %i conversions, if no
@@ -565,7 +563,6 @@ literal:
nread += p - buf;
nconversions++;
break;
-
}
}
input_failure:
@@ -613,7 +610,6 @@ __sccl(char *tab, const u_char *fmt)
doswitch:
n = *fmt++; /* and examine the next */
switch (n) {
-
case 0: /* format ended too soon */
return (fmt - 1);
@@ -665,4 +661,3 @@ doswitch:
}
/* NOTREACHED */
}
-
Modified: head/sys/kern/subr_smp.c
==============================================================================
--- head/sys/kern/subr_smp.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_smp.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -493,7 +493,7 @@ smp_rendezvous_action(void)
#ifdef INVARIANTS
owepreempt = td->td_owepreempt;
#endif
-
+
/*
* If requested, run a setup function before the main action
* function. Ensure all CPUs have completed the setup
@@ -720,7 +720,7 @@ smp_topo_none(void)
top->cg_children = 0;
top->cg_level = CG_SHARE_NONE;
top->cg_flags = 0;
-
+
return (top);
}
@@ -1302,4 +1302,3 @@ topo_analyze(struct topo_node *topo_root, int all,
}
#endif /* SMP */
-
Modified: head/sys/kern/subr_terminal.c
==============================================================================
--- head/sys/kern/subr_terminal.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_terminal.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -192,7 +192,7 @@ terminal_init(struct terminal *tm)
default_message.ta_bgcolor |= TC_LIGHT;
kernel_message.ta_bgcolor |= TC_LIGHT;
}
-
+
if (default_message.ta_bgcolor == TC_BLACK &&
default_message.ta_fgcolor < TC_NCOLORS)
kernel_message.ta_fgcolor |= TC_LIGHT;
Modified: head/sys/kern/subr_turnstile.c
==============================================================================
--- head/sys/kern/subr_turnstile.c Tue Sep 1 22:11:48 2020 (r365221)
+++ head/sys/kern/subr_turnstile.c Tue Sep 1 22:12:32 2020 (r365222)
@@ -342,7 +342,6 @@ turnstile_adjust_thread(struct turnstile *ts, struct t
td2 = TAILQ_NEXT(td, td_lockq);
if ((td1 != NULL && td->td_priority < td1->td_priority) ||
(td2 != NULL && td->td_priority > td2->td_priority)) {
-
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-head
mailing list