 @@ -1,14 +1,14 @@
-/*	$NetBSD: ffs_vnops.c,v 1.104 2008/10/10 09:21:58 hannken Exp $	*/
+/*	$NetBSD: ffs_vnops.c,v 1.105 2008/12/21 10:44:32 ad Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -51,27 +51,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.104 2008/10/10 09:21:58 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vnops.c,v 1.105 2008/12/21 10:44:32 ad Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_wapbl.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 @@ -392,74 +392,81 @@ ffs_fsync(void *v)
 out:
 	fstrans_done(vp->v_mount);
 	return error;
+}
 /*
  * Synch an open file.
  */
 /* ARGSUSED */
 int
 ffs_full_fsync(struct vnode *vp, int flags)
+{
 	extern struct vfsops ffs_vfsops;
 	struct buf *bp, *nbp;
 	int error, passes, skipmeta, inodedeps_only, waitfor;
 	struct mount *mp;
 	bool ffsino;
 	error = 0;
 	if ((flags & FSYNC_VFS) != 0) {
 		KASSERT(vp->v_specmountpoint != NULL);
 		mp = vp->v_specmountpoint;
 		ffsino = (mp->mnt_op == &ffs_vfsops);
 		KASSERT(vp->v_type == VBLK);
 	} else {
 		mp = vp->v_mount;
 		ffsino = true;
 		KASSERT(vp->v_tag == VT_UFS);
+	}
 	if (vp->v_type == VBLK &&
 	    vp->v_specmountpoint != NULL &&
 	    (vp->v_specmountpoint->mnt_flag & MNT_SOFTDEP))
 		softdep_fsync_mountdev(vp);
 	mutex_enter(&vp->v_interlock);
 	inodedeps_only = DOINGSOFTDEP(vp) && (flags & FSYNC_RECLAIM)
 	    && UVM_OBJ_IS_CLEAN(&vp->v_uobj) && LIST_EMPTY(&vp->v_dirtyblkhd);
 	/*
 	 * Flush all dirty data associated with a vnode.
 	 */
 	if (vp->v_type == VREG || vp->v_type == VBLK) {
 		int pflags = PGO_ALLPAGES | PGO_CLEANIT;
 		if ((flags & FSYNC_VFS) != 0 && vp->v_specmountpoint != NULL)
 			mp = vp->v_specmountpoint;
 		else
 			mp = vp->v_mount;
 		if ((flags & FSYNC_WAIT))
 			pflags |= PGO_SYNCIO;
 		if (vp->v_type == VREG &&
 		    fstrans_getstate(mp) == FSTRANS_SUSPENDING)
 			pflags |= PGO_FREE;
 		error = VOP_PUTPAGES(vp, 0, 0, pflags);
 		if (error)
 			return error;
 	} else {
 		mp = vp->v_mount;
 		mutex_exit(&vp->v_interlock);
+	}
 #ifdef WAPBL
 	if (mp && mp->mnt_wapbl) {
 		error = 0;
 		if (flags & FSYNC_DATAONLY)
 			return error;
-		if (VTOI(vp) && (VTOI(vp)->i_flag &
+		if (ffsino && VTOI(vp) && (VTOI(vp)->i_flag &
 		    (IN_ACCESS | IN_CHANGE | IN_UPDATE | IN_MODIFY |
 				 IN_MODIFIED | IN_ACCESSED))) {
 			error = UFS_WAPBL_BEGIN(mp);
 			if (error)
 				return error;
 			error = ffs_update(vp, NULL, NULL,
 				(flags & FSYNC_WAIT) ? UPDATE_WAIT : 0);
 			UFS_WAPBL_END(mp);
+		}
 		if (error || (flags & FSYNC_NOLOG))
 			return error;
 		/*
 		 * Don't flush the log if the vnode being flushed
 @@ -559,32 +566,28 @@ loop:
+			}
 #ifdef DIAGNOSTIC
 			if (vp->v_type != VBLK)
 				vprint("ffs_fsync: dirty", vp);
 #endif
+		}
+	}
 	if (inodedeps_only)
 		waitfor = 0;
 	else
 		waitfor = (flags & FSYNC_WAIT) ? UPDATE_WAIT : 0;
-	if (vp->v_tag == VT_UFS)
+	if (ffsino)
 		error = ffs_update(vp, NULL, NULL, waitfor);
 	else {
 		KASSERT(vp->v_type == VBLK);
 		KASSERT((flags & FSYNC_VFS) != 0);
 	if (error == 0 && flags & FSYNC_CACHE) {
 		int i = 0;
 		if ((flags & FSYNC_VFS) == 0) {
 			KASSERT(VTOI(vp) != NULL);
 			vp = VTOI(vp)->i_devvp;
+		}
 		VOP_IOCTL(vp, DIOCCACHESYNC, &i, FWRITE, curlwp->l_cred);
+	}
 	return error;
+}