Module Name: src
Committed By: riastradh
Date: Sat Dec 7 02:23:10 UTC 2024
Modified Files:
src/sys/kern: vfs_cache.c vfs_hooks.c vfs_init.c vfs_lookup.c
vfs_mount.c vfs_syscalls.c vfs_trans.c vfs_vnode.c vfs_wapbl.c
Log Message:
vfs(9): Fix some more whitespace issues.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/sys/kern/vfs_cache.c
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/vfs_hooks.c
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/vfs_init.c
cvs rdiff -u -r1.236 -r1.237 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.108 -r1.109 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.569 -r1.570 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.71 -r1.72 src/sys/kern/vfs_trans.c
cvs rdiff -u -r1.154 -r1.155 src/sys/kern/vfs_vnode.c
cvs rdiff -u -r1.114 -r1.115 src/sys/kern/vfs_wapbl.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.157 src/sys/kern/vfs_cache.c:1.158
--- src/sys/kern/vfs_cache.c:1.157 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_cache.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_cache.c,v 1.157 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_cache.c,v 1.158 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020, 2023 The NetBSD Foundation, Inc.
@@ -184,7 +184,7 @@
#define __NAMECACHE_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.157 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.158 2024/12/07 02:23:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -561,7 +561,7 @@ cache_lookup(struct vnode *dvp, const ch
/* Could the entry be purged below? */
if ((cnflags & ISLASTCN) != 0 &&
((cnflags & MAKEENTRY) == 0 || nameiop == CREATE)) {
- op = RW_WRITER;
+ op = RW_WRITER;
} else {
op = RW_READER;
}
@@ -726,9 +726,10 @@ cache_lookup_linked(struct vnode *dvp, c
KASSERT(dvi->vi_nc_gid != VNOVAL);
error = kauth_authorize_vnode(cred,
KAUTH_ACCESS_ACTION(VEXEC,
- dvp->v_type, dvi->vi_nc_mode & ALLPERMS), dvp, NULL,
+ dvp->v_type, dvi->vi_nc_mode & ALLPERMS),
+ dvp, NULL,
genfs_can_access(dvp, cred, dvi->vi_nc_uid, dvi->vi_nc_gid,
- dvi->vi_nc_mode & ALLPERMS, NULL, VEXEC));
+ dvi->vi_nc_mode & ALLPERMS, NULL, VEXEC));
if (error != 0) {
if (newlock != NULL) {
rw_exit(newlock);
@@ -825,11 +826,13 @@ cache_revlookup(struct vnode *vp, struct
KASSERT(vi->vi_nc_gid != VNOVAL);
error = kauth_authorize_vnode(kauth_cred_get(),
KAUTH_ACCESS_ACTION(VEXEC, vp->v_type, vi->vi_nc_mode &
- ALLPERMS), vp, NULL, genfs_can_access(vp, curlwp->l_cred,
- vi->vi_nc_uid, vi->vi_nc_gid, vi->vi_nc_mode & ALLPERMS,
- NULL, accmode));
- if (error != 0) {
- rw_exit(&vi->vi_nc_listlock);
+ ALLPERMS),
+ vp, NULL, genfs_can_access(vp, curlwp->l_cred,
+ vi->vi_nc_uid, vi->vi_nc_gid,
+ vi->vi_nc_mode & ALLPERMS,
+ NULL, accmode));
+ if (error != 0) {
+ rw_exit(&vi->vi_nc_listlock);
COUNT(ncs_denied);
return EACCES;
}
@@ -853,7 +856,7 @@ cache_revlookup(struct vnode *vp, struct
if (ncp->nc_name[0] == '.') {
if (nlen == 1 ||
(nlen == 2 && ncp->nc_name[1] == '.')) {
- break;
+ break;
}
}
@@ -1351,7 +1354,7 @@ cache_deactivate(void)
/* If we're nowhere near budget yet, don't bother. */
total = cache_lru.count[LRU_ACTIVE] + cache_lru.count[LRU_INACTIVE];
if (total < (desiredvnodes >> 1)) {
- return;
+ return;
}
/*
Index: src/sys/kern/vfs_hooks.c
diff -u src/sys/kern/vfs_hooks.c:1.7 src/sys/kern/vfs_hooks.c:1.8
--- src/sys/kern/vfs_hooks.c:1.7 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_hooks.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_hooks.c,v 1.7 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_hooks.c,v 1.8 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_hooks.c,v 1.7 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_hooks.c,v 1.8 2024/12/07 02:23:09 riastradh Exp $");
#include <sys/param.h>
@@ -80,7 +80,7 @@ vfs_hooks_detach(struct vfs_hooks *vfs_h
}
}
if (hp == NULL)
- ret = ESRCH;
+ ret = ESRCH;
mutex_exit(&vfs_hooks_lock);
return ret;
@@ -97,9 +97,9 @@ func fargs \
{ \
int error; \
struct vfs_hooks *hp; \
- \
+ \
error = EJUSTRETURN; \
- \
+ \
mutex_enter(&vfs_hooks_lock); \
LIST_FOREACH(hp, &vfs_hooks_head, vfs_hooks_list) { \
if (hp-> hook != NULL) { \
@@ -109,7 +109,7 @@ func fargs \
} \
} \
mutex_exit(&vfs_hooks_lock); \
- \
+ \
return error; \
}
@@ -123,7 +123,7 @@ void \
func fargs \
{ \
struct vfs_hooks *hp; \
- \
+ \
mutex_enter(&vfs_hooks_lock); \
LIST_FOREACH(hp, &vfs_hooks_head, vfs_hooks_list) { \
if (hp-> hook != NULL) \
Index: src/sys/kern/vfs_init.c
diff -u src/sys/kern/vfs_init.c:1.65 src/sys/kern/vfs_init.c:1.66
--- src/sys/kern/vfs_init.c:1.65 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_init.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_init.c,v 1.65 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_init.c,v 1.66 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 1998, 2000, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.65 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_init.c,v 1.66 2024/12/07 02:23:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -555,7 +555,7 @@ vfs_detach(struct vfsops *vfs)
*/
vfs_opv_free(vfs->vfs_opv_descs);
out:
- mutex_exit(&vfs_list_lock);
+ mutex_exit(&vfs_list_lock);
return error;
}
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.236 src/sys/kern/vfs_lookup.c:1.237
--- src/sys/kern/vfs_lookup.c:1.236 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_lookup.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.236 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.237 2024/12/07 02:23:09 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.236 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.237 2024/12/07 02:23:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1020,7 +1020,7 @@ lookup_crossmount(struct namei_state *st
}
/* If searchdir is still around, re-lock it. */
- if (error == 0 && lktype != LK_NONE) {
+ if (error == 0 && lktype != LK_NONE) {
vn_lock(searchdir, lktype | LK_RETRY);
*searchdir_locked = true;
}
@@ -1239,8 +1239,8 @@ unionlookup:
KASSERT(searchdir_locked);
if ((cnp->cn_flags & (ISLASTCN | LOCKPARENT)) !=
(ISLASTCN | LOCKPARENT)) {
- VOP_UNLOCK(searchdir);
- searchdir_locked = false;
+ VOP_UNLOCK(searchdir);
+ searchdir_locked = false;
}
} else {
KASSERT(!searchdir_locked);
@@ -1307,11 +1307,11 @@ lookup_fastforward(struct namei_state *s
if ((cnp->cn_flags & ISDOTDOT) != 0) {
if ((searchdir->v_vflag & VV_ROOT) != 0 &&
(cnp->cn_flags & NOCROSSMOUNT)) {
- error = EOPNOTSUPP;
+ error = EOPNOTSUPP;
break;
}
if (ndp->ni_rootdir != rootvnode) {
- error = EOPNOTSUPP;
+ error = EOPNOTSUPP;
break;
}
}
@@ -1352,7 +1352,7 @@ lookup_fastforward(struct namei_state *s
if (foundobj == NULL) {
if ((searchdir->v_vflag & VV_ROOT) != 0 &&
(searchdir->v_mount->mnt_flag & MNT_UNION) != 0) {
- error = EOPNOTSUPP;
+ error = EOPNOTSUPP;
} else {
error = ENOENT;
terminal = ((cnp->cn_flags & ISLASTCN) != 0);
@@ -1570,8 +1570,8 @@ namei_oneroot(struct namei_state *state,
foundobj->v_type == VDIR &&
foundobj->v_mountedhere != NULL &&
(cnp->cn_flags & NOCROSSMOUNT) == 0) {
- error = lookup_crossmount(state, &searchdir,
- &foundobj, &searchdir_locked);
+ error = lookup_crossmount(state, &searchdir,
+ &foundobj, &searchdir_locked);
}
if (error) {
@@ -1865,8 +1865,8 @@ skiploop:
* it can't be safely changed. Feh. XXX
*/
KASSERT(searchdir_locked);
- VOP_UNLOCK(searchdir);
- searchdir_locked = false;
+ VOP_UNLOCK(searchdir);
+ searchdir_locked = false;
} else if ((cnp->cn_flags & LOCKLEAF) != 0 &&
(searchdir != foundobj ||
(cnp->cn_flags & LOCKPARENT) == 0)) {
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.108 src/sys/kern/vfs_mount.c:1.109
--- src/sys/kern/vfs_mount.c:1.108 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_mount.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.108 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.109 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 1997-2020 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.108 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_mount.c,v 1.109 2024/12/07 02:23:09 riastradh Exp $");
#include "veriexec.h"
@@ -499,7 +499,7 @@ vfs_vnode_iterator_next1(struct vnode_it
again:
if (vip == NULL) {
mutex_exit(lock);
- return NULL;
+ return NULL;
}
vp = VIMPL_TO_VNODE(vip);
KASSERT(vp != NULL);
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.569 src/sys/kern/vfs_syscalls.c:1.570
--- src/sys/kern/vfs_syscalls.c:1.569 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_syscalls.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.569 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.570 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2009, 2019, 2020, 2023 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.569 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.570 2024/12/07 02:23:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -649,8 +649,8 @@ do_sys_mount(struct lwp *l, const char *
done:
if (vfsopsrele)
vfs_delref(vfsops);
- if (vp != NULL) {
- vrele(vp);
+ if (vp != NULL) {
+ vrele(vp);
}
if (data_buf != data)
kmem_free(data_buf, alloc_sz);
@@ -1706,7 +1706,7 @@ change_root(struct vnode *vp)
kauth_proc_chroot(ncred, p->p_cwdi);
/* Broadcast our credentials to the process and other LWPs. */
- proc_crmod_leave(ncred, p->p_cred, true);
+ proc_crmod_leave(ncred, p->p_cred, true);
}
/*
@@ -2064,7 +2064,7 @@ again:
/*
* userland told us wrong size.
*/
- error = EINVAL;
+ error = EINVAL;
}
}
kmem_free(fhp, fhsize);
@@ -3012,7 +3012,7 @@ sys_lseek(struct lwp *l, const struct sy
error = (*fp->f_ops->fo_seek)(fp, SCARG(uap, offset),
SCARG(uap, whence), (off_t *)retval, FOF_UPDATE_OFFSET);
out:
- fd_putfile(fd);
+ fd_putfile(fd);
return (error);
}
Index: src/sys/kern/vfs_trans.c
diff -u src/sys/kern/vfs_trans.c:1.71 src/sys/kern/vfs_trans.c:1.72
--- src/sys/kern/vfs_trans.c:1.71 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_trans.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_trans.c,v 1.71 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_trans.c,v 1.72 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 2007, 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.71 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_trans.c,v 1.72 2024/12/07 02:23:09 riastradh Exp $");
/*
* File system transaction operations.
@@ -997,8 +997,8 @@ fscow_run(struct buf *bp, bool data_vali
LIST_FOREACH(hp, &fmi->fmi_cow_handler, ch_list)
if ((error = (*hp->ch_func)(hp->ch_arg, bp, data_valid)) != 0)
break;
- if (error == 0)
- bp->b_flags |= B_COWDONE;
+ if (error == 0)
+ bp->b_flags |= B_COWDONE;
/*
* Check if other threads want to change the list.
Index: src/sys/kern/vfs_vnode.c
diff -u src/sys/kern/vfs_vnode.c:1.154 src/sys/kern/vfs_vnode.c:1.155
--- src/sys/kern/vfs_vnode.c:1.154 Sat Dec 7 02:11:42 2024
+++ src/sys/kern/vfs_vnode.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnode.c,v 1.154 2024/12/07 02:11:42 riastradh Exp $ */
+/* $NetBSD: vfs_vnode.c,v 1.155 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 1997-2011, 2019, 2020 The NetBSD Foundation, Inc.
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.154 2024/12/07 02:11:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.155 2024/12/07 02:23:09 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
@@ -522,7 +522,7 @@ lru_requeue(vnode_t *vp, vnodelst_t *lis
vip = VNODE_TO_VIMPL(vp);
if (listhd == vip->vi_lrulisthd &&
(getticks() - vip->vi_lrulisttm) < hz) {
- return;
+ return;
}
mutex_enter(&vdrain_lock);
Index: src/sys/kern/vfs_wapbl.c
diff -u src/sys/kern/vfs_wapbl.c:1.114 src/sys/kern/vfs_wapbl.c:1.115
--- src/sys/kern/vfs_wapbl.c:1.114 Sat Dec 7 02:11:43 2024
+++ src/sys/kern/vfs_wapbl.c Sat Dec 7 02:23:09 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_wapbl.c,v 1.114 2024/12/07 02:11:43 riastradh Exp $ */
+/* $NetBSD: vfs_wapbl.c,v 1.115 2024/12/07 02:23:09 riastradh Exp $ */
/*-
* Copyright (c) 2003, 2008, 2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define WAPBL_INTERNAL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.114 2024/12/07 02:11:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.115 2024/12/07 02:23:09 riastradh Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,
static int wapbl_flush_disk_cache = 1;
static int wapbl_verbose_commit = 0;
-static int wapbl_allow_dpofua = 0; /* switched off by default for now */
+static int wapbl_allow_dpofua = 0; /* switched off by default for now */
static int wapbl_journal_iobufs = 4;
static inline size_t wapbl_space_free(size_t, off_t, off_t);
@@ -122,7 +122,7 @@ struct wapbl {
unsigned wl_lock_count; /* m: Count of transactions in progress */
- size_t wl_circ_size; /* r: Number of bytes in buffer of log */
+ size_t wl_circ_size; /* r: Number of bytes in buffer of log */
size_t wl_circ_off; /* r: Number of bytes reserved at start */
size_t wl_bufcount_max; /* r: Number of buffers reserved for log */
@@ -235,14 +235,14 @@ struct wapbl {
TAILQ_HEAD(, buf) wl_iobufs; /* l: Free or filling bufs */
TAILQ_HEAD(, buf) wl_iobufs_busy; /* l: In-transit bufs */
- int wl_dkcache; /* r: disk cache flags */
+ int wl_dkcache; /* r: disk cache flags */
#define WAPBL_USE_FUA(wl) \
(wapbl_allow_dpofua && ISSET((wl)->wl_dkcache, DKCACHE_FUA))
#define WAPBL_JFLAGS(wl) \
(WAPBL_USE_FUA(wl) ? (wl)->wl_jwrite_flags : 0)
#define WAPBL_JDATA_FLAGS(wl) \
(WAPBL_JFLAGS(wl) & B_MEDIA_DPO) /* only DPO */
- int wl_jwrite_flags; /* r: journal write flags */
+ int wl_jwrite_flags; /* r: journal write flags */
};
#ifdef WAPBL_DEBUG_PRINT
@@ -1552,7 +1552,7 @@ wapbl_truncate(struct wapbl *wl, size_t
minfree -= avail;
while (wl->wl_error_count == 0 &&
wl->wl_reclaimable_bytes < minfree) {
- WAPBL_PRINTF(WAPBL_PRINT_TRUNCATE,
+ WAPBL_PRINTF(WAPBL_PRINT_TRUNCATE,
("wapbl_truncate: sleeping on %p"
" wl=%p bytes=%zd minfree=%zd\n",
&wl->wl_reclaimable_bytes,
@@ -3240,7 +3240,7 @@ wapbl_replay_process(struct wapbl_replay
default:
printf("Unrecognized wapbl type: 0x%08x\n",
wcn->wc_type);
- error = EFTYPE;
+ error = EFTYPE;
goto errout;
}
wapbl_circ_advance(wr, wcn->wc_len, &saveoff);
