Module Name: src
Committed By: ad
Date: Fri Apr 10 16:55:40 UTC 2020
Modified Files:
src/sys/kern: vfs_cache.c
Log Message:
Cosmetic changes
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/kern/vfs_cache.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_cache.c
diff -u src/sys/kern/vfs_cache.c:1.137 src/sys/kern/vfs_cache.c:1.138
--- src/sys/kern/vfs_cache.c:1.137 Sat Apr 4 20:49:30 2020
+++ src/sys/kern/vfs_cache.c Fri Apr 10 16:55:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.137 2020/04/04 20:49:30 ad Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.138 2020/04/10 16:55:40 ad Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -172,7 +172,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.137 2020/04/04 20:49:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.138 2020/04/10 16:55:40 ad Exp $");
#define __NAMECACHE_PRIVATE
#ifdef _KERNEL_OPT
@@ -241,7 +241,7 @@ struct nchcpu {
static callout_t cache_stat_callout;
static kmutex_t cache_stat_lock __cacheline_aligned;
-#define COUNT(f) do { \
+#define COUNT(f) do { \
lwp_t *l = curlwp; \
KPREEMPT_DISABLE(l); \
((struct nchstats_percpu *)curcpu()->ci_data.cpu_nch)->f++; \
@@ -417,10 +417,10 @@ cache_lookup_entry(struct vnode *dvp, co
if (__predict_false(RB_SENTINEL_P(node))) {
return NULL;
}
- KASSERT((void *)&ncp->nc_tree == (void *)ncp);
ncp = (struct namecache *)node;
+ KASSERT((void *)&ncp->nc_tree == (void *)ncp);
KASSERT(ncp->nc_dvp == dvp);
- if (__predict_false(ncp->nc_key == key)) {
+ if (ncp->nc_key == key) {
KASSERT(ncp->nc_nlen == namelen);
diff = memcmp(ncp->nc_name, name, namelen);
if (__predict_true(diff == 0)) {
