diff options
Diffstat (limited to 'sys/fs/devfs')
-rw-r--r-- | sys/fs/devfs/devfs_devs.c | 4 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vfsops.c | 2 | ||||
-rw-r--r-- | sys/fs/devfs/devfs_vnops.c | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index 7ca8e6b..1d5e3c9 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -245,11 +245,9 @@ void devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int vp_locked) { struct vnode *vp; - struct thread *td; KASSERT((de->de_flags & DE_DOOMED) == 0, ("devfs_delete doomed dirent")); - td = curthread; de->de_flags |= DE_DOOMED; mtx_lock(&devfs_de_interlock); vp = de->de_vnode; @@ -264,7 +262,7 @@ devfs_delete(struct devfs_mount *dm, struct devfs_dirent *de, int vp_locked) VI_UNLOCK(vp); vgone(vp); if (!vp_locked) - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); vdrop(vp); sx_xlock(&dm->dm_lock); } else diff --git a/sys/fs/devfs/devfs_vfsops.c b/sys/fs/devfs/devfs_vfsops.c index f3a364b..9a9bc38 100644 --- a/sys/fs/devfs/devfs_vfsops.c +++ b/sys/fs/devfs/devfs_vfsops.c @@ -100,7 +100,7 @@ devfs_mount(struct mount *mp, struct thread *td) return (error); } - VOP_UNLOCK(rvp, 0, td); + VOP_UNLOCK(rvp, 0); vfs_mountedfrom(mp, "devfs"); diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c index 5e4fa4d..b08b9fa 100644 --- a/sys/fs/devfs/devfs_vnops.c +++ b/sys/fs/devfs/devfs_vnops.c @@ -361,7 +361,7 @@ devfs_close(struct vop_close_args *ap) vholdl(vp); VI_UNLOCK(vp); vp_locked = VOP_ISLOCKED(vp, td); - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); KASSERT(dev->si_refcount > 0, ("devfs_close() on un-referenced struct cdev *(%s)", devtoname(dev))); if (!(dsw->d_flags & D_NEEDGIANT)) { @@ -587,7 +587,7 @@ devfs_lookupx(struct vop_lookup_args *ap, int *dm_unlock) if (flags & ISDOTDOT) { if ((flags & ISLASTCN) && nameiop != LOOKUP) return (EINVAL); - VOP_UNLOCK(dvp, 0, td); + VOP_UNLOCK(dvp, 0); de = TAILQ_FIRST(&dd->de_dlist); /* "." */ de = TAILQ_NEXT(de, de_list); /* ".." */ de = de->de_dir; @@ -770,7 +770,7 @@ devfs_open(struct vop_open_args *ap) if (dsw->d_flags & D_TTY) vp->v_vflag |= VV_ISTTY; - VOP_UNLOCK(vp, 0, td); + VOP_UNLOCK(vp, 0); if(!(dsw->d_flags & D_NEEDGIANT)) { DROP_GIANT(); @@ -1059,7 +1059,7 @@ devfs_revoke(struct vop_revoke_args *ap) vgone(vp); vdrop(vp); - VOP_UNLOCK(vp,0,curthread); + VOP_UNLOCK(vp,0); loop: for (;;) { mtx_lock(&devfs_de_interlock); |