Module Name: src
Committed By: riastradh
Date: Fri Jan 14 21:59:51 UTC 2022
Modified Files:
src/sys/miscfs/genfs: genfs_io.c
Log Message:
genfs(9): Prune dead branch.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/miscfs/genfs/genfs_io.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/miscfs/genfs/genfs_io.c
diff -u src/sys/miscfs/genfs/genfs_io.c:1.101 src/sys/miscfs/genfs/genfs_io.c:1.102
--- src/sys/miscfs/genfs/genfs_io.c:1.101 Wed Aug 19 07:29:00 2020
+++ src/sys/miscfs/genfs/genfs_io.c Fri Jan 14 21:59:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.101 2020/08/19 07:29:00 simonb Exp $ */
+/* $NetBSD: genfs_io.c,v 1.102 2022/01/14 21:59:50 riastradh Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.101 2020/08/19 07:29:00 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.102 2022/01/14 21:59:50 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -988,11 +988,8 @@ retry:
*/
if (nodirty) {
-#if !defined(DEBUG)
- if (dirtyonly) {
- goto skip_scan;
- }
-#endif /* !defined(DEBUG) */
+ /* We handled the dirtyonly && nodirty case above. */
+ KASSERT(!dirtyonly);
flags &= ~PGO_CLEANIT;
}
@@ -1331,10 +1328,6 @@ retry:
vn_syncer_remove_from_worklist(vp);
}
-#if !defined(DEBUG)
-skip_scan:
-#endif /* !defined(DEBUG) */
-
/* Wait for output to complete. */
rw_exit(slock);
if (!wasclean && !async && vp->v_numoutput != 0) {
