 @@ -1,14 +1,14 @@
-/*	$NetBSD: vnode_if.c,v 1.107 2017/07/12 09:31:59 hannken Exp $	*/
+/*	$NetBSD: vnode_if.c,v 1.108 2019/10/11 08:05:19 hannken Exp $	*/
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
  * (Modifications made here may easily be lost!)
+ *
  * Created from the file:
  *	NetBSD: vnode_if.src,v 1.77 2017/07/12 09:31:07 hannken Exp
  * by the script:
  *	NetBSD: vnode_if.sh,v 1.66 2017/06/04 08:03:26 hannken Exp
  */
 /*
  * Copyright (c) 1992, 1993, 1994, 1995
 @@ -30,78 +30,80 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.107 2017/07/12 09:31:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.108 2019/10/11 08:05:19 hannken Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/fstrans.h>
-enum fst_op { FST_NO, FST_YES, FST_TRY };
+enum fst_op { FST_NO, FST_YES, FST_LAZY, FST_TRY };
 static inline int
 vop_pre(vnode_t *vp, struct mount **mp, bool *mpsafe, enum fst_op op)
+{
 	int error;
 	*mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!*mpsafe) {
 		KERNEL_LOCK(1, curlwp);
+	}
-	if (op == FST_YES || op == FST_TRY) {
+	if (op == FST_YES || op == FST_LAZY || op == FST_TRY) {
 		for (;;) {
 			*mp = vp->v_mount;
 			if (op == FST_TRY) {
 				error = fstrans_start_nowait(*mp);
 				if (error) {
 					if (!*mpsafe) {
 						KERNEL_UNLOCK_ONE(curlwp);
+					}
 					return error;
+				}
 			} else if (op == FST_LAZY) {
 				fstrans_start_lazy(*mp);
 			} else {
 				fstrans_start(*mp);
+			}
 			if (__predict_true(*mp == vp->v_mount))
 				break;
 			fstrans_done(*mp);
+		}
 	} else {
 		*mp = vp->v_mount;
+	}
 	return 0;
+}
 static inline void
 vop_post(vnode_t *vp, struct mount *mp, bool mpsafe, enum fst_op op)
+{
-	if (op == FST_YES) {
+	if (op == FST_YES || op == FST_LAZY) {
 		fstrans_done(mp);
+	}
 	if (!mpsafe) {
 		KERNEL_UNLOCK_ONE(curlwp);
+	}
+}
 const struct vnodeop_desc vop_default_desc = {
 ,
 	"default",
 ,
 	NULL,
 @@ -1368,31 +1370,31 @@ const struct vnodeop_desc vop_strategy_d
 	VDESC_NO_OFFSET,
 };
 int
 VOP_STRATEGY(struct vnode *vp,
     struct buf *bp)
+{
 	int error;
 	bool mpsafe;
 	struct vop_strategy_args a;
 	struct mount *mp;
 	a.a_desc = VDESC(vop_strategy);
 	a.a_vp = vp;
 	a.a_bp = bp;
-	error = vop_pre(vp, &mp, &mpsafe, FST_YES);
+	error = vop_pre(vp, &mp, &mpsafe, FST_LAZY);
 	if (error)
 		return error;
 	error = (VCALL(vp, VOFFSET(vop_strategy), &a));
-	vop_post(vp, mp, mpsafe, FST_YES);
+	vop_post(vp, mp, mpsafe, FST_LAZY);
 	return error;
+}
 const int vop_print_vp_offsets[] = {
 	VOPARG_OFFSETOF(struct vop_print_args,a_vp),
 	VDESC_NO_OFFSET
 };
 const struct vnodeop_desc vop_print_desc = {
 	VOP_PRINT_DESCOFFSET,
 	"vop_print",
 ,
 	vop_print_vp_offsets,
 	VDESC_NO_OFFSET,