diff options
Diffstat (limited to 'sys/gnu')
-rw-r--r-- | sys/gnu/ext2fs/ext2_ihash.c | 2 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_inode.c | 1 | ||||
-rw-r--r-- | sys/gnu/ext2fs/ext2_vfsops.c | 1 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_inode.c | 1 | ||||
-rw-r--r-- | sys/gnu/fs/ext2fs/ext2_vfsops.c | 1 |
5 files changed, 1 insertions, 5 deletions
diff --git a/sys/gnu/ext2fs/ext2_ihash.c b/sys/gnu/ext2fs/ext2_ihash.c index decbc35..df2bd98 100644 --- a/sys/gnu/ext2fs/ext2_ihash.c +++ b/sys/gnu/ext2fs/ext2_ihash.c @@ -148,7 +148,7 @@ ext2_ihashins(ip) struct ihashhead *ipp; /* lock the inode, then put it on the appropriate hash list */ - lockmgr(&ip->i_vnode->v_lock, LK_EXCLUSIVE, (struct mtx *)0, td); + vn_lock(ITOV(ip), LK_EXCLUSIVE | LK_RETRY, td); mtx_lock(&ext2_ihash_mtx); ipp = INOHASH(ip->i_dev, ip->i_number); diff --git a/sys/gnu/ext2fs/ext2_inode.c b/sys/gnu/ext2fs/ext2_inode.c index a96dc67..fc14dba 100644 --- a/sys/gnu/ext2fs/ext2_inode.c +++ b/sys/gnu/ext2fs/ext2_inode.c @@ -546,7 +546,6 @@ ext2_reclaim(ap) vrele(ip->i_devvp); ip->i_devvp = 0; } - lockdestroy(&vp->v_lock); FREE(vp->v_data, M_EXT2NODE); vp->v_data = 0; return (0); diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index cb358c0..8f27bdb 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -1017,7 +1017,6 @@ restart: return (error); } bzero((caddr_t)ip, sizeof(struct inode)); - lockinit(&vp->v_lock, PINOD, "ext2in", 0, 0); vp->v_data = ip; ip->i_vnode = vp; ip->i_e2fs = fs = ump->um_e2fs; diff --git a/sys/gnu/fs/ext2fs/ext2_inode.c b/sys/gnu/fs/ext2fs/ext2_inode.c index a96dc67..fc14dba 100644 --- a/sys/gnu/fs/ext2fs/ext2_inode.c +++ b/sys/gnu/fs/ext2fs/ext2_inode.c @@ -546,7 +546,6 @@ ext2_reclaim(ap) vrele(ip->i_devvp); ip->i_devvp = 0; } - lockdestroy(&vp->v_lock); FREE(vp->v_data, M_EXT2NODE); vp->v_data = 0; return (0); diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index cb358c0..8f27bdb 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -1017,7 +1017,6 @@ restart: return (error); } bzero((caddr_t)ip, sizeof(struct inode)); - lockinit(&vp->v_lock, PINOD, "ext2in", 0, 0); vp->v_data = ip; ip->i_vnode = vp; ip->i_e2fs = fs = ump->um_e2fs; |