Module Name: src
Committed By: christos
Date: Thu Mar 2 00:43:40 UTC 2017
Modified Files:
src/sys/ufs/ffs: ffs_vnops.c
Log Message:
ifdef reduction
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/ufs/ffs/ffs_vnops.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/ufs/ffs/ffs_vnops.c
diff -u src/sys/ufs/ffs/ffs_vnops.c:1.127 src/sys/ufs/ffs/ffs_vnops.c:1.128
--- src/sys/ufs/ffs/ffs_vnops.c:1.127 Wed Mar 1 16:55:07 2017
+++ src/sys/ufs/ffs/ffs_vnops.c Wed Mar 1 19:43:40 2017
@@ -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 @@ ffs_spec_fsync(void *v)
} */ *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 @@ ffs_spec_fsync(void *v)
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 @@ ffs_full_fsync(struct vnode *vp, int fla
#ifdef WAPBL
struct mount *mp = vp->v_mount;
+
if (mp && mp->mnt_wapbl) {
/*
