Fri Jan 1 14:04:17 2021 UTC ()

Nix trailing whitespace.


(riastradh)

diff -r1.77 -r1.78 src/sys/kern/subr_lockdebug.c

--- src/sys/kern/subr_lockdebug.c 2020/05/15 13:09:02	1.77
+++ src/sys/kern/subr_lockdebug.c 2021/01/01 14:04:17	1.78

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_lockdebug.c,v 1.77 2020/05/15 13:09:02 maxv Exp $	*/
+/*	$NetBSD: subr_lockdebug.c,v 1.78 2021/01/01 14:04:17 riastradh Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Basic lock debugging code shared among lock primitives.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.77 2020/05/15 13:09:02 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_lockdebug.c,v 1.78 2021/01/01 14:04:17 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
 #endif
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/lockdebug.h>
 #include <sys/sleepq.h>
 #include <sys/cpu.h>
 @@ -593,36 +593,36 @@ lockdebug_unlocked(const char *func, siz
+			}
 			TAILQ_REMOVE(&l->l_ld_locks, ld, ld_chain);
 		} else {
 			uint16_t idx = (uint16_t)cpu_index(curcpu());
 			if (__predict_false(ld->ld_cpu != idx)) {
 				lockdebug_abort1(func, line, ld, s,
 				    "not held by current CPU", true);
 				return;
+			}
 			TAILQ_REMOVE(&curcpu()->ci_data.cpu_ld_locks, ld,
 			    ld_chain);
+		}
 		ld->ld_flags &= ~LD_LOCKED;
 		ld->ld_unlocked = where;
 		ld->ld_lwp = NULL;
+	}
 	__cpu_simple_unlock(&ld->ld_spinlock);
 	splx(s);
+}
 /*
  * lockdebug_barrier:
+ *
  *	Panic if we hold more than one specified lock, and optionally, if we
  *	hold any sleep locks.
  */
 void
 lockdebug_barrier(const char *func, size_t line, volatile void *onelock,
     int slplocks)
+{
 	struct lwp *l = curlwp;
 	lockdebug_t *ld;
 	int s;
 	if (__predict_false(panicstr != NULL || ld_panic))
 		return;
 @@ -1013,27 +1013,27 @@ lockdebug_dismiss(void)
  * lockdebug_abort:
+ *
  *	An error has been trapped - dump lock info and call panic().
  */
 void
 lockdebug_abort(const char *func, size_t line, const volatile void *lock,
     lockops_t *ops, const char *msg)
+{
 #ifdef LOCKDEBUG
 	lockdebug_t *ld;
 	int s;
 	s = splhigh();
 	if ((ld = lockdebug_lookup(func, line, lock,
 			(uintptr_t) __builtin_return_address(0))) != NULL) {
 		lockdebug_abort1(func, line, ld, s, msg, true);
 		return;
+	}
 	splx(s);
 #endif	/* LOCKDEBUG */
 	/*
 	 * Don't make the situation worse if the system is already going
 	 * down in flames.  Once a panic is triggered, lockdebug state
 	 * becomes stale and cannot be trusted.
 	 */
 	if (atomic_inc_uint_nv(&ld_panic) > 1)