Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/miscfs/genfs genfs(9): Prune dead branch.



details:   https://anonhg.NetBSD.org/src/rev/a81c5dfc920d
branches:  trunk
changeset: 359620:a81c5dfc920d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Fri Jan 14 21:59:50 2022 +0000

description:
genfs(9): Prune dead branch.

diffstat:

 sys/miscfs/genfs/genfs_io.c |  15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diffs (43 lines):

diff -r a736c6a1f531 -r a81c5dfc920d sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Fri Jan 14 21:32:27 2022 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Fri Jan 14 21:59:50 2022 +0000
@@ -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 @@
         */
 
        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 @@
                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) {



Home | Main Index | Thread Index | Old Index