[src/trunk]: src/sys/kern Rename labels to make wapbl_flush a little easier t...

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

details:   https://anonhg.NetBSD.org/src/rev/8184de91c52e
branches:  trunk
changeset: 345101:8184de91c52e
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat May 07 17:12:22 2016 +0000

description:
Rename labels to make wapbl_flush a little easier to follow.

out ---> wait_out
out2 ---> out

>From coypu.

diffstat:

 sys/kern/vfs_wapbl.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (79 lines):

diff -r 4ee66bf0efec -r 8184de91c52e sys/kern/vfs_wapbl.c
--- a/sys/kern/vfs_wapbl.c      Sat May 07 16:43:02 2016 +0000
+++ b/sys/kern/vfs_wapbl.c      Sat May 07 17:12:22 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_wapbl.c,v 1.68 2016/05/07 06:38:47 riastradh Exp $ */
+/*     $NetBSD: vfs_wapbl.c,v 1.69 2016/05/07 17:12:22 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.68 2016/05/07 06:38:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_wapbl.c,v 1.69 2016/05/07 17:12:22 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bitops.h>
@@ -1470,7 +1470,7 @@
         * do another check for nothing to do.
         */
        if (wl->wl_bufcount == 0) {
-               goto out;
+               goto wait_out;
        }
 
 #if 0
@@ -1502,20 +1502,20 @@
 
        error = wapbl_truncate(wl, flushsize, 0);
        if (error)
-               goto out2;
+               goto out;
 
        off = wl->wl_head;
        KASSERT((off == 0) || ((off >= wl->wl_circ_off) && 
                              (off < wl->wl_circ_off + wl->wl_circ_size)));
        error = wapbl_write_blocks(wl, &off);
        if (error)
-               goto out2;
+               goto out;
        error = wapbl_write_revocations(wl, &off);
        if (error)
-               goto out2;
+               goto out;
        error = wapbl_write_inodes(wl, &off);
        if (error)
-               goto out2;
+               goto out;
 
        reserved = 0;
        if (wl->wl_inohashcnt)
@@ -1548,7 +1548,7 @@
 
        error = wapbl_write_commit(wl, head, tail);
        if (error)
-               goto out2;
+               goto out;
 
        we = pool_get(&wapbl_entry_pool, PR_WAITOK);
 
@@ -1626,7 +1626,7 @@
                     curproc->p_pid, curlwp->l_lid));
 #endif
 
- out:
+ wait_out:
 
        /*
         * If the waitfor flag is set, don't return until everything is
@@ -1637,7 +1637,7 @@
                        wl->wl_reserved_bytes, wapbl_lazy_truncate);
        }
 
- out2:
+ out:
        if (error) {
                wl->wl_flush_abort(wl->wl_mount, wl->wl_deallocblks,
                    wl->wl_dealloclens, wl->wl_dealloccnt);