Module Name: src
Committed By: riastradh
Date: Sun Apr 30 08:46:11 UTC 2023
Modified Files:
src/sys/kern: vfs_subr.c
Log Message:
kern/vfs_subr.c: Revert previous build fixes, no longer needed.
SDT_PROBE* will now DTRT here.
To generate a diff of this commit:
cvs rdiff -u -r1.499 -r1.500 src/sys/kern/vfs_subr.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_subr.c
diff -u src/sys/kern/vfs_subr.c:1.499 src/sys/kern/vfs_subr.c:1.500
--- src/sys/kern/vfs_subr.c:1.499 Sat Apr 29 23:30:18 2023
+++ src/sys/kern/vfs_subr.c Sun Apr 30 08:46:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.499 2023/04/29 23:30:18 kre Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.500 2023/04/30 08:46:11 riastradh Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008, 2019, 2020
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.499 2023/04/29 23:30:18 kre Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.500 2023/04/30 08:46:11 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_43.h"
@@ -714,7 +714,7 @@ vn_syncer_add1(struct vnode *vp, int del
void
vn_syncer_add_to_worklist(struct vnode *vp, int delayx)
{
- SDT_VAR_DECL(vnode_impl_t *vip = VNODE_TO_VIMPL(vp));
+ vnode_impl_t *vip = VNODE_TO_VIMPL(vp);
KASSERT(mutex_owned(vp->v_interlock));
@@ -840,10 +840,9 @@ sched_sync(void *arg)
struct vnode *vp;
struct mount *mp;
time_t starttime, endtime;
- int vdelay, nslot, delayx;
- SDT_VAR_DECL(int oslot);
+ int vdelay, oslot, nslot, delayx;
bool synced;
- SDT_VAR_DECL(int error);
+ int error;
for (;;) {
starttime = time_second;
@@ -862,21 +861,14 @@ sched_sync(void *arg)
}
vdelay = sync_delay(mp);
-#ifdef KDTRACE_HOOKS
oslot = mp->mnt_synclist_slot;
-#endif
nslot = sync_delay_slot(vdelay);
mp->mnt_synclist_slot = nslot;
SDT_PROBE4(vfs, syncer, worklist, mount__update,
mp, vdelay, oslot, nslot);
SDT_PROBE1(vfs, syncer, sync, mount__start, mp);
-#ifdef KDTRACE_HOOKS
- error =
-#else
- (void)
-#endif
- VFS_SYNC(mp, MNT_LAZY, curlwp->l_cred);
+ error = VFS_SYNC(mp, MNT_LAZY, curlwp->l_cred);
SDT_PROBE2(vfs, syncer, sync, mount__done,
mp, error);
}
@@ -926,9 +918,7 @@ sched_sync(void *arg)
* into the future.
*/
delayx = synced ? syncdelay : lockdelay;
-#ifdef KDTRACE_HOOKS
oslot = vi->vi_synclist_slot;
-#endif
vn_syncer_add1(vp, delayx);
nslot = vi->vi_synclist_slot;
SDT_PROBE4(vfs, syncer, worklist,
