diff options
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_denode.c | 5 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_lookup.c | 8 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vfsops.c | 10 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 5 |
4 files changed, 12 insertions, 16 deletions
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 9ff5d6086ec..d50f5bc0283 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_denode.c,v 1.61 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: msdosfs_denode.c,v 1.62 2018/05/02 02:24:56 visa Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */ /*- @@ -189,7 +189,6 @@ deget(struct msdosfsmount *pmp, uint32_t dirclust, uint32_t diroffset, struct denode *ldep; struct vnode *nvp; struct buf *bp; - struct proc *p = curproc; /* XXX */ #ifdef MSDOSFS_DEBUG printf("deget(pmp %p, dirclust %d, diroffset %x, depp %p)\n", @@ -249,7 +248,7 @@ retry: * can't be accessed until we've read it in and have done what we * need to it. */ - vn_lock(nvp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(nvp, LK_EXCLUSIVE | LK_RETRY); error = msdosfs_hashins(ldep); if (error) { diff --git a/sys/msdosfs/msdosfs_lookup.c b/sys/msdosfs/msdosfs_lookup.c index dab91299e80..73c9d41989f 100644 --- a/sys/msdosfs/msdosfs_lookup.c +++ b/sys/msdosfs/msdosfs_lookup.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_lookup.c,v 1.31 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: msdosfs_lookup.c,v 1.32 2018/05/02 02:24:56 visa Exp $ */ /* $NetBSD: msdosfs_lookup.c,v 1.34 1997/10/18 22:12:27 ws Exp $ */ /*- @@ -85,7 +85,6 @@ msdosfs_lookup(void *v) struct vnode *vdp = ap->a_dvp; struct vnode **vpp = ap->a_vpp; struct componentname *cnp = ap->a_cnp; - struct proc *p = cnp->cn_proc; daddr_t bn; int error; int lockparent; @@ -552,13 +551,12 @@ foundroot:; VOP_UNLOCK(pdp); /* race to get the inode */ cnp->cn_flags |= PDIRUNLOCK; if ((error = deget(pmp, cluster, blkoff, &tdp)) != 0) { - if (vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, p) == 0) + if (vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY) == 0) cnp->cn_flags &= ~PDIRUNLOCK; return (error); } if (lockparent && (flags & ISLASTCN)) { - if ((error = vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY, - p))) { + if ((error = vn_lock(pdp, LK_EXCLUSIVE | LK_RETRY))) { vput(DETOV(tdp)); return (error); } diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index e8b7fac2c5c..8960a77a204 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vfsops.c,v 1.88 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: msdosfs_vfsops.c,v 1.89 2018/05/02 02:24:56 visa Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.48 1997/10/18 02:54:57 briggs Exp $ */ /*- @@ -281,7 +281,7 @@ msdosfs_mountfs(struct vnode *devvp, struct mount *mp, struct proc *p, return (error); if (vcount(devvp) > 1 && devvp != rootvp) return (EBUSY); - vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(devvp, LK_EXCLUSIVE | LK_RETRY); error = vinvalbuf(devvp, V_SAVE, p->p_ucred, p, 0, 0); VOP_UNLOCK(devvp); if (error) @@ -564,7 +564,7 @@ error_exit: if (bp) brelse(bp); - vn_lock(devvp, LK_EXCLUSIVE|LK_RETRY, p); + vn_lock(devvp, LK_EXCLUSIVE|LK_RETRY); (void) VOP_CLOSE(devvp, ronly ? FREAD : FREAD|FWRITE, NOCRED, p); VOP_UNLOCK(devvp); @@ -605,7 +605,7 @@ msdosfs_unmount(struct mount *mp, int mntflags,struct proc *p) #ifdef MSDOSFS_DEBUG vprint("msdosfs_umount(): just before calling VOP_CLOSE()\n", vp); #endif - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); (void)VOP_CLOSE(vp, pmp->pm_flags & MSDOSFSMNT_RONLY ? FREAD : FREAD|FWRITE, NOCRED, p); vput(vp); @@ -721,7 +721,7 @@ msdosfs_sync(struct mount *mp, int waitfor, int stall, struct ucred *cred, * Force stale file system control information to be flushed. */ if (waitfor != MNT_LAZY) { - vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY, p); + vn_lock(pmp->pm_devvp, LK_EXCLUSIVE | LK_RETRY); if ((error = VOP_FSYNC(pmp->pm_devvp, cred, waitfor, p)) != 0) msa.allerror = error; VOP_UNLOCK(pmp->pm_devvp); diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index f5d5e5f34f4..a592cd75010 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.118 2018/04/28 03:13:05 visa Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.119 2018/05/02 02:24:56 visa Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -944,7 +944,6 @@ msdosfs_rename(void *v) struct vnode *fdvp = ap->a_fdvp; struct componentname *tcnp = ap->a_tcnp; struct componentname *fcnp = ap->a_fcnp; - struct proc *p = curproc; /* XXX */ struct denode *ip, *xp, *dp, *zp; u_char toname[11], oldname[11]; uint32_t from_diroffset, to_diroffset; @@ -993,7 +992,7 @@ abortit: } /* */ - if ((error = vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY, p)) != 0) + if ((error = vn_lock(fvp, LK_EXCLUSIVE | LK_RETRY)) != 0) goto abortit; dp = VTODE(fdvp); ip = VTODE(fvp); |