[src/trunk]: src/sys/ufs/ffs ifdef reduction

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

details:   https://anonhg.NetBSD.org/src/rev/1682cafff4bc
branches:  trunk
changeset: 351860:1682cafff4bc
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Mar 02 00:43:40 2017 +0000

description:
ifdef reduction

diffstat:

 sys/ufs/ffs/ffs_vnops.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r b2bdd5976b6e -r 1682cafff4bc sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c   Wed Mar 01 21:55:07 2017 +0000
+++ b/sys/ufs/ffs/ffs_vnops.c   Thu Mar 02 00:43:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_vnops.c,v 1.127 2017/03/01 21:55:07 hannken Exp $  */
+/*     $NetBSD: ffs_vnops.c,v 1.128 2017/03/02 00:43:40 christos Exp $ */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.127 2017/03/01 21:55:07 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.128 2017/03/02 00:43:40 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -283,9 +283,6 @@
        } */ *ap = v;
        int error, flags, uflags;
        struct vnode *vp;
-#ifdef WAPBL
-       struct mount *mp;
-#endif /* WAPBL */
 
        flags = ap->a_flags;
        uflags = UPDATE_CLOSE | ((flags & FSYNC_WAIT) ? UPDATE_WAIT : 0);
@@ -296,7 +293,8 @@
                goto out;
 
 #ifdef WAPBL
-       mp = vp->v_mount;
+       struct mount *mp = vp->v_mount;
+
        if (mp && mp->mnt_wapbl) {
                /*
                 * Don't bother writing out metadata if the syncer is
@@ -462,6 +460,7 @@
 
 #ifdef WAPBL
        struct mount *mp = vp->v_mount;
+
        if (mp && mp->mnt_wapbl) {
 
                /*