Module Name: src Committed By: hannken Date: Wed Feb 22 09:47:18 UTC 2017
Modified Files: src/sys/kern: vnode_if.c src/sys/rump/include/rump: rumpvnode_if.h src/sys/rump/librump/rumpvfs: rumpvnode_if.c src/sys/sys: vnode_if.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/kern/vnode_if.c cvs rdiff -u -r1.20 -r1.21 src/sys/rump/include/rump/rumpvnode_if.h cvs rdiff -u -r1.20 -r1.21 src/sys/rump/librump/rumpvfs/rumpvnode_if.c cvs rdiff -u -r1.91 -r1.92 src/sys/sys/vnode_if.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/vnode_if.c diff -u src/sys/kern/vnode_if.c:1.96 src/sys/kern/vnode_if.c:1.97 --- src/sys/kern/vnode_if.c:1.96 Tue Jan 26 23:30:10 2016 +++ src/sys/kern/vnode_if.c Wed Feb 22 09:47:18 2017 @@ -1,13 +1,13 @@ -/* $NetBSD: vnode_if.c,v 1.96 2016/01/26 23:30:10 pooka Exp $ */ +/* $NetBSD: vnode_if.c,v 1.97 2017/02/22 09:47:18 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.69 2015/04/20 23:08:07 riastradh Exp + * NetBSD: vnode_if.src,v 1.70 2017/02/22 09:45:51 hannken 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.62 2017/02/22 09:45:51 hannken 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: vnode_if.c,v 1.97 2017/02/22 09:47:18 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> const struct vnodeop_desc vop_default_desc = { 0, @@ -79,12 +80,15 @@ VOP_BWRITE(struct vnode *vp, 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 @@ VOP_POLL(struct vnode *vp, 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 @@ VOP_KQFILTER(struct vnode *vp, 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 @@ VOP_MMAP(struct vnode *vp, 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 @@ VOP_SEEK(struct vnode *vp, 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 @@ VOP_SEEK(struct vnode *vp, 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 @@ VOP_RENAME(struct vnode *fdvp, 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 @@ VOP_RENAME(struct vnode *fdvp, 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 @@ VOP_ABORTOP(struct vnode *dvp, 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 @@ VOP_BMAP(struct vnode *vp, 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 @@ VOP_BMAP(struct vnode *vp, 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 @@ VOP_STRATEGY(struct vnode *vp, 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 @@ VOP_PRINT(struct vnode *vp) 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 @@ VOP_ADVLOCK(struct vnode *vp, 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 @@ VOP_ADVLOCK(struct vnode *vp, 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; } Index: src/sys/rump/include/rump/rumpvnode_if.h diff -u src/sys/rump/include/rump/rumpvnode_if.h:1.20 src/sys/rump/include/rump/rumpvnode_if.h:1.21 --- src/sys/rump/include/rump/rumpvnode_if.h:1.20 Tue Jan 26 23:30:10 2016 +++ src/sys/rump/include/rump/rumpvnode_if.h Wed Feb 22 09:47:18 2017 @@ -1,13 +1,13 @@ -/* $NetBSD: rumpvnode_if.h,v 1.20 2016/01/26 23:30:10 pooka Exp $ */ +/* $NetBSD: rumpvnode_if.h,v 1.21 2017/02/22 09:47:18 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.69 2015/04/20 23:08:07 riastradh Exp + * NetBSD: vnode_if.src,v 1.70 2017/02/22 09:45:51 hannken 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.62 2017/02/22 09:45:51 hannken Exp */ /* Index: src/sys/rump/librump/rumpvfs/rumpvnode_if.c diff -u src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.20 src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.21 --- src/sys/rump/librump/rumpvfs/rumpvnode_if.c:1.20 Tue Jan 26 23:30:10 2016 +++ src/sys/rump/librump/rumpvfs/rumpvnode_if.c Wed Feb 22 09:47:18 2017 @@ -1,13 +1,13 @@ -/* $NetBSD: rumpvnode_if.c,v 1.20 2016/01/26 23:30:10 pooka Exp $ */ +/* $NetBSD: rumpvnode_if.c,v 1.21 2017/02/22 09:47:18 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.69 2015/04/20 23:08:07 riastradh Exp + * NetBSD: vnode_if.src,v 1.70 2017/02/22 09:45:51 hannken 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.62 2017/02/22 09:45:51 hannken 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: rumpvnode_if.c,v 1.21 2017/02/22 09:47:18 hannken Exp $"); #include <sys/param.h> #include <sys/mount.h> Index: src/sys/sys/vnode_if.h diff -u src/sys/sys/vnode_if.h:1.91 src/sys/sys/vnode_if.h:1.92 --- src/sys/sys/vnode_if.h:1.91 Tue Jan 26 23:30:10 2016 +++ src/sys/sys/vnode_if.h Wed Feb 22 09:47:18 2017 @@ -1,13 +1,13 @@ -/* $NetBSD: vnode_if.h,v 1.91 2016/01/26 23:30:10 pooka Exp $ */ +/* $NetBSD: vnode_if.h,v 1.92 2017/02/22 09:47:18 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.69 2015/04/20 23:08:07 riastradh Exp + * NetBSD: vnode_if.src,v 1.70 2017/02/22 09:45:51 hannken 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.62 2017/02/22 09:45:51 hannken Exp */ /*