diff options
Diffstat (limited to 'sys/fs/udf')
| -rw-r--r-- | sys/fs/udf/udf_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/udf/udf_vnops.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index b23e30f..b41b86b 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -613,8 +613,6 @@ udf_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) unode->i_dev = udfmp->im_dev; unode->udfmp = udfmp; vp->v_data = unode; - lockinit(&vp->v_lock, PINOD, "udfnode", 0, 0); - vp->v_vnlock = &vp->v_lock; VREF(udfmp->im_devvp); udf_hashins(unode); diff --git a/sys/fs/udf/udf_vnops.c b/sys/fs/udf/udf_vnops.c index 2f71d86..4e4a4b6 100644 --- a/sys/fs/udf/udf_vnops.c +++ b/sys/fs/udf/udf_vnops.c @@ -135,8 +135,7 @@ udf_hashins(struct udf_node *node) mtx_lock(&udfmp->hash_mtx); TAILQ_INSERT_TAIL(&udfmp->udf_tqh, node, tq); mtx_unlock(&udfmp->hash_mtx); - lockmgr(&node->i_vnode->v_lock, LK_EXCLUSIVE, (struct mtx *)0, - curthread); + vn_lock(node->i_vnode, LK_EXCLUSIVE | LK_RETRY, curthread); return (0); } @@ -1028,7 +1027,6 @@ udf_reclaim(struct vop_reclaim_args *a) if (unode->fentry != NULL) FREE(unode->fentry, M_UDFFENTRY); - lockdestroy(&unode->i_vnode->v_lock); uma_zfree(udf_zone_node, unode); vp->v_data = NULL; } |
