diff options
Diffstat (limited to 'sys/isofs/cd9660')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_lookup.c | 6 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 4 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 8 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index 5ddc79bd0b0..c14cec3e7a2 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_lookup.c,v 1.23 2015/03/14 03:38:50 jsg Exp $ */ +/* $OpenBSD: cd9660_lookup.c,v 1.24 2016/03/19 12:04:15 natano Exp $ */ /* $NetBSD: cd9660_lookup.c,v 1.18 1997/05/08 16:19:59 mycroft Exp $ */ /*- @@ -377,7 +377,7 @@ found: */ if (flags & ISDOTDOT) { brelse(bp); - VOP_UNLOCK(pdp, 0, p); /* race to get the inode */ + VOP_UNLOCK(pdp, p); /* race to get the inode */ cnp->cn_flags |= PDIRUNLOCK; error = cd9660_vget_internal(vdp->v_mount, dp->i_ino, &tdp, dp->i_ino != ino, NULL); @@ -405,7 +405,7 @@ found: if (error) return (error); if (!lockparent || !(flags & ISLASTCN)) { - VOP_UNLOCK(pdp, 0, p); + VOP_UNLOCK(pdp, p); cnp->cn_flags |= PDIRUNLOCK; } *vpp = tdp; diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 23d50a13abc..5d08d12a5e5 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_node.c,v 1.29 2015/03/14 03:38:50 jsg Exp $ */ +/* $OpenBSD: cd9660_node.c,v 1.30 2016/03/19 12:04:15 natano Exp $ */ /* $NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $ */ /*- @@ -194,7 +194,7 @@ cd9660_inactive(v) #endif ip->i_flag = 0; - VOP_UNLOCK(vp, 0, p); + VOP_UNLOCK(vp, p); /* * If we are done with the inode, reclaim it * so that it can be reused immediately. diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 3aef062b318..f1fcac5f3e4 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vfsops.c,v 1.75 2016/03/17 18:52:31 bluhm Exp $ */ +/* $OpenBSD: cd9660_vfsops.c,v 1.76 2016/03/19 12:04:15 natano Exp $ */ /* $NetBSD: cd9660_vfsops.c,v 1.26 1997/06/13 15:38:58 pk Exp $ */ /*- @@ -190,7 +190,7 @@ cd9660_mount(mp, path, data, ndp, p) vput(devvp); return (error); } - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); } if ((mp->mnt_flag & MNT_UPDATE) == 0) error = iso_mountfs(devvp, mp, p, &args); @@ -261,7 +261,7 @@ iso_mountfs(devvp, mp, p, argp) return (EBUSY); vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); error = vinvalbuf(devvp, V_SAVE, p->p_ucred, p, 0, 0); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); if (error) return (error); @@ -452,7 +452,7 @@ out: vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p); - VOP_UNLOCK(devvp, 0, p); + VOP_UNLOCK(devvp, p); if (isomp) { free((caddr_t)isomp, M_ISOFSMNT, 0); diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 3abda09af54..771d399633d 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_vnops.c,v 1.74 2016/01/19 19:11:21 stefan Exp $ */ +/* $OpenBSD: cd9660_vnops.c,v 1.75 2016/03/19 12:04:15 natano Exp $ */ /* $NetBSD: cd9660_vnops.c,v 1.42 1997/10/16 23:56:57 christos Exp $ */ /*- @@ -708,7 +708,7 @@ cd9660_unlock(void *v) struct vop_unlock_args *ap = v; struct vnode *vp = ap->a_vp; - return (lockmgr(&VTOI(vp)->i_lock, ap->a_flags | LK_RELEASE, NULL)); + return (lockmgr(&VTOI(vp)->i_lock, LK_RELEASE, NULL)); } /* |