diff options
Diffstat (limited to 'sys/fs/cd9660')
| -rw-r--r-- | sys/fs/cd9660/cd9660_node.c | 3 | ||||
| -rw-r--r-- | sys/fs/cd9660/cd9660_vfsops.c | 5 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index 44e60fa..e120bc4 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -143,7 +143,7 @@ cd9660_ihashins(ip) *ipp = ip; mtx_unlock(&cd9660_ihash_mtx); - lockmgr(&ip->i_vnode->v_lock, LK_EXCLUSIVE, (struct mtx *)0, curthread); + vn_lock(ITOV(ip), LK_EXCLUSIVE | LK_RETRY, curthread); } /* @@ -223,7 +223,6 @@ cd9660_reclaim(ap) vrele(ip->i_devvp); ip->i_devvp = 0; } - lockdestroy(&ip->i_vnode->v_lock); FREE(vp->v_data, M_ISOFSNODE); vp->v_data = NULL; return (0); diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 74608a6..c25d4bb 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -714,11 +714,6 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir) } MALLOC(ip, struct iso_node *, sizeof(struct iso_node), M_ISOFSNODE, M_WAITOK | M_ZERO); - lockinit(&vp->v_lock, PINOD, "isonode", 0, 0); - /* - * ISOFS uses stdlock and can share lock structure - */ - vp->v_vnlock = &vp->v_lock; vp->v_data = ip; ip->i_vnode = vp; ip->i_dev = dev; |
