regen

Regen vnode_if.c etc.

diff -r b3ebd9465f5c -r 159e0355c051 sys/kern/vnode_if.c
--- a/sys/kern/vnode_if.c	Fri Feb 17 14:58:35 2017 +0100
+++ b/sys/kern/vnode_if.c	Fri Feb 17 14:58:35 2017 +0100
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode_if.c,v 1.96 2016/01/26 23:30:10 pooka Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
  * Created from the file:
  *	NetBSD: vnode_if.src,v 1.69 2015/04/20 23:08:07 riastradh Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.60 2014/01/13 12:07:55 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.61 2016/01/26 23:28:06 pooka Exp
  */
 
 /*
@@ -40,13 +40,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnode_if.c,v 1.96 2016/01/26 23:30:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD$");
 
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
+#include <sys/fstrans.h>
 
 const struct vnodeop_desc vop_default_desc = {
 	0,
@@ -79,12 +80,15 @@
 	int error;
 	bool mpsafe;
 	struct vop_bwrite_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_bwrite);
 	a.a_vp = vp;
 	a.a_bp = bp;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_bwrite), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -588,12 +592,15 @@
 	int error;
 	bool mpsafe;
 	struct vop_poll_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_poll);
 	a.a_vp = vp;
 	a.a_events = events;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_poll), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -618,12 +625,15 @@
 	int error;
 	bool mpsafe;
 	struct vop_kqfilter_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_kqfilter);
 	a.a_vp = vp;
 	a.a_kn = kn;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_kqfilter), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -679,13 +689,16 @@
 	int error;
 	bool mpsafe;
 	struct vop_mmap_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_mmap);
 	a.a_vp = vp;
 	a.a_prot = prot;
 	a.a_cred = cred;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_mmap), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -748,6 +761,7 @@
 	int error;
 	bool mpsafe;
 	struct vop_seek_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_seek);
 	a.a_vp = vp;
 	a.a_oldoff = oldoff;
@@ -755,7 +769,9 @@
 	a.a_cred = cred;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_seek), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -853,6 +869,7 @@
 	int error;
 	bool mpsafe;
 	struct vop_rename_args a;
+	struct mount *mp = fdvp->v_mount;
 	a.a_desc = VDESC(vop_rename);
 	a.a_fdvp = fdvp;
 	a.a_fvp = fvp;
@@ -862,7 +879,9 @@
 	a.a_tcnp = tcnp;
 	mpsafe = (fdvp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(fdvp, VOFFSET(vop_rename), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -1070,12 +1089,15 @@
 	int error;
 	bool mpsafe;
 	struct vop_abortop_args a;
+	struct mount *mp = dvp->v_mount;
 	a.a_desc = VDESC(vop_abortop);
 	a.a_dvp = dvp;
 	a.a_cnp = cnp;
 	mpsafe = (dvp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(dvp, VOFFSET(vop_abortop), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -1219,6 +1241,7 @@
 	int error;
 	bool mpsafe;
 	struct vop_bmap_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_bmap);
 	a.a_vp = vp;
 	a.a_bn = bn;
@@ -1227,7 +1250,9 @@
 	a.a_runp = runp;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_bmap), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -1252,12 +1277,15 @@
 	int error;
 	bool mpsafe;
 	struct vop_strategy_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_strategy);
 	a.a_vp = vp;
 	a.a_bp = bp;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_strategy), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -1281,11 +1309,14 @@
 	int error;
 	bool mpsafe;
 	struct vop_print_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_print);
 	a.a_vp = vp;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_print), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
@@ -1373,6 +1404,7 @@
 	int error;
 	bool mpsafe;
 	struct vop_advlock_args a;
+	struct mount *mp = vp->v_mount;
 	a.a_desc = VDESC(vop_advlock);
 	a.a_vp = vp;
 	a.a_id = id;
@@ -1381,7 +1413,9 @@
 	a.a_flags = flags;
 	mpsafe = (vp->v_vflag & VV_MPSAFE);
 	if (!mpsafe) { KERNEL_LOCK(1, curlwp); }
+	fstrans_start(mp, FSTRANS_SHARED);
 	error = (VCALL(vp, VOFFSET(vop_advlock), &a));
+	fstrans_done(mp);
 	if (!mpsafe) { KERNEL_UNLOCK_ONE(curlwp); }
 	return error;
 }
diff -r b3ebd9465f5c -r 159e0355c051 sys/rump/include/rump/rumpvnode_if.h
--- a/sys/rump/include/rump/rumpvnode_if.h	Fri Feb 17 14:58:35 2017 +0100
+++ b/sys/rump/include/rump/rumpvnode_if.h	Fri Feb 17 14:58:35 2017 +0100
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvnode_if.h,v 1.20 2016/01/26 23:30:10 pooka Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
  * Created from the file:
  *	NetBSD: vnode_if.src,v 1.69 2015/04/20 23:08:07 riastradh Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.60 2014/01/13 12:07:55 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.61 2016/01/26 23:28:06 pooka Exp
  */
 
 /*
diff -r b3ebd9465f5c -r 159e0355c051 sys/rump/librump/rumpkern/emul.c
--- a/sys/rump/librump/rumpkern/emul.c	Fri Feb 17 14:58:35 2017 +0100
+++ b/sys/rump/librump/rumpkern/emul.c	Fri Feb 17 14:58:35 2017 +0100
@@ -31,6 +31,7 @@
 #include <sys/param.h>
 #include <sys/cprng.h>
 #include <sys/filedesc.h>
+#include <sys/fstrans.h>
 #include <sys/kauth.h>
 #include <sys/module.h>
 #include <sys/reboot.h>
@@ -240,6 +241,25 @@
 __strong_alias(delay,rump_delay);
 __strong_alias(_delay,rump_delay);
 
+/* Weak aliases for fstrans to be used unless librumpvfs is present. */
+
+int rump__fstrans_start(struct mount *, enum fstrans_lock_type, int);
+int
+rump__fstrans_start(struct mount *mp, enum fstrans_lock_type lock, int wait)
+{
+
+	return 0;
+}
+__weak_alias(_fstrans_start,rump__fstrans_start);
+
+void rump_fstrans_done(struct mount *);
+void
+rump_fstrans_done(struct mount *mp)
+{
+
+}
+__weak_alias(fstrans_done,rump_fstrans_done);
+
 /*
  * Provide weak aliases for tty routines used by printf.
  * They will be used unless the rumpkern_tty component is present.
diff -r b3ebd9465f5c -r 159e0355c051 sys/rump/librump/rumpvfs/rumpvnode_if.c
--- a/sys/rump/librump/rumpvfs/rumpvnode_if.c	Fri Feb 17 14:58:35 2017 +0100
+++ b/sys/rump/librump/rumpvfs/rumpvnode_if.c	Fri Feb 17 14:58:35 2017 +0100
@@ -1,4 +1,4 @@
-/*	$NetBSD: rumpvnode_if.c,v 1.20 2016/01/26 23:30:10 pooka Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
  * Created from the file:
  *	NetBSD: vnode_if.src,v 1.69 2015/04/20 23:08:07 riastradh Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.60 2014/01/13 12:07:55 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.61 2016/01/26 23:28:06 pooka Exp
  */
 
 /*
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpvnode_if.c,v 1.20 2016/01/26 23:30:10 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD$");
 
 #include <sys/param.h>
 #include <sys/mount.h>
diff -r b3ebd9465f5c -r 159e0355c051 sys/sys/vnode_if.h
--- a/sys/sys/vnode_if.h	Fri Feb 17 14:58:35 2017 +0100
+++ b/sys/sys/vnode_if.h	Fri Feb 17 14:58:35 2017 +0100
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnode_if.h,v 1.91 2016/01/26 23:30:10 pooka Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * Warning: DO NOT EDIT! This file is automatically generated!
@@ -7,7 +7,7 @@
  * Created from the file:
  *	NetBSD: vnode_if.src,v 1.69 2015/04/20 23:08:07 riastradh Exp
  * by the script:
- *	NetBSD: vnode_if.sh,v 1.60 2014/01/13 12:07:55 hannken Exp
+ *	NetBSD: vnode_if.sh,v 1.61 2016/01/26 23:28:06 pooka Exp
  */
 
 /*