[src/uebayasi-xip]: src/sys/miscfs/genfs Kill one more goto.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/21cc7872d86b
branches:  uebayasi-xip
changeset: 751889:21cc7872d86b
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Sun Nov 21 04:56:36 2010 +0000

description:
Kill one more goto.

diffstat:

 sys/miscfs/genfs/genfs_io.c |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (54 lines):

diff -r 38c39844bd70 -r 21cc7872d86b sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c       Sun Nov 21 04:50:27 2010 +0000
+++ b/sys/miscfs/genfs/genfs_io.c       Sun Nov 21 04:56:36 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genfs_io.c,v 1.36.2.55 2010/11/21 04:50:27 uebayasi Exp $      */
+/*     $NetBSD: genfs_io.c,v 1.36.2.56 2010/11/21 04:56:36 uebayasi Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.55 2010/11/21 04:50:27 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.36.2.56 2010/11/21 04:56:36 uebayasi Exp $");
 
 #include "opt_xip.h"
 
@@ -827,7 +827,7 @@
                genfs_node_unlock(vp);
        }
 
-       if (xip) {
+    if (xip) {
                error = genfs_do_getpages_xip_io_done(
                        ap->a_vp,
                        ap->a_offset,
@@ -838,12 +838,8 @@
                        ap->a_advice,
                        ap->a_flags,
                        orignmempages);
-               goto genfs_getpages_generic_io_done_done;
-       }
+    } else {
 #if 0
-       else {
-               error = genfs_getpages_generic_io_done();
-       }
 }
 
 int
@@ -922,11 +918,8 @@
                genfs_markdirty(vp);
        }
        mutex_exit(&uobj->vmobjlock);
+    } /* !xip */
 
-#if 1
-genfs_getpages_generic_io_done_done:
-       {}
-#endif
        if (ap->a_m != NULL) {
                memcpy(ap->a_m, &pgs[ridx],
                    orignmempages * sizeof(struct vm_page *));