summaryrefslogtreecommitdiffstats
path: root/sys/ntfs
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ntfs')
-rw-r--r--sys/ntfs/ntfs_ihash.c12
-rw-r--r--sys/ntfs/ntfs_subr.c14
-rw-r--r--sys/ntfs/ntfs_vfsops.c4
3 files changed, 15 insertions, 15 deletions
diff --git a/sys/ntfs/ntfs_ihash.c b/sys/ntfs/ntfs_ihash.c
index b9c0345..fea648c 100644
--- a/sys/ntfs/ntfs_ihash.c
+++ b/sys/ntfs/ntfs_ihash.c
@@ -93,11 +93,11 @@ ntfs_nthashlookup(dev, inum)
{
struct ntnode *ip;
- mtx_enter(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_lock(&ntfs_nthash_mtx);
LIST_FOREACH(ip, NTNOHASH(dev, inum), i_hash)
if (inum == ip->i_number && dev == ip->i_dev)
break;
- mtx_exit(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_unlock(&ntfs_nthash_mtx);
return (ip);
}
@@ -111,11 +111,11 @@ ntfs_nthashins(ip)
{
struct nthashhead *ipp;
- mtx_enter(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_lock(&ntfs_nthash_mtx);
ipp = NTNOHASH(ip->i_dev, ip->i_number);
LIST_INSERT_HEAD(ipp, ip, i_hash);
ip->i_flag |= IN_HASHED;
- mtx_exit(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_unlock(&ntfs_nthash_mtx);
}
/*
@@ -125,10 +125,10 @@ void
ntfs_nthashrem(ip)
struct ntnode *ip;
{
- mtx_enter(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_lock(&ntfs_nthash_mtx);
if (ip->i_flag & IN_HASHED) {
ip->i_flag &= ~IN_HASHED;
LIST_REMOVE(ip, i_hash);
}
- mtx_exit(&ntfs_nthash_mtx, MTX_DEF);
+ mtx_unlock(&ntfs_nthash_mtx);
}
diff --git a/sys/ntfs/ntfs_subr.c b/sys/ntfs/ntfs_subr.c
index 38324f2..c55cd0a 100644
--- a/sys/ntfs/ntfs_subr.c
+++ b/sys/ntfs/ntfs_subr.c
@@ -360,7 +360,7 @@ ntfs_ntget(ip)
dprintf(("ntfs_ntget: get ntnode %d: %p, usecount: %d\n",
ip->i_number, ip, ip->i_usecount));
- mtx_enter(&ip->i_interlock, MTX_DEF);
+ mtx_lock(&ip->i_interlock);
ip->i_usecount++;
LOCKMGR(&ip->i_lock, LK_EXCLUSIVE | LK_INTERLOCK, &ip->i_interlock);
@@ -438,7 +438,7 @@ ntfs_ntput(ip)
dprintf(("ntfs_ntput: rele ntnode %d: %p, usecount: %d\n",
ip->i_number, ip, ip->i_usecount));
- mtx_enter(&ip->i_interlock, MTX_DEF);
+ mtx_lock(&ip->i_interlock);
ip->i_usecount--;
#ifdef DIAGNOSTIC
@@ -462,7 +462,7 @@ ntfs_ntput(ip)
LIST_REMOVE(vap,va_list);
ntfs_freentvattr(vap);
}
- mtx_exit(&ip->i_interlock, MTX_DEF);
+ mtx_unlock(&ip->i_interlock);
mtx_destroy(&ip->i_interlock);
lockdestroy(&ip->i_lock);
@@ -479,9 +479,9 @@ void
ntfs_ntref(ip)
struct ntnode *ip;
{
- mtx_enter(&ip->i_interlock, MTX_DEF);
+ mtx_lock(&ip->i_interlock);
ip->i_usecount++;
- mtx_exit(&ip->i_interlock, MTX_DEF);
+ mtx_unlock(&ip->i_interlock);
dprintf(("ntfs_ntref: ino %d, usecount: %d\n",
ip->i_number, ip->i_usecount));
@@ -498,13 +498,13 @@ ntfs_ntrele(ip)
dprintf(("ntfs_ntrele: rele ntnode %d: %p, usecount: %d\n",
ip->i_number, ip, ip->i_usecount));
- mtx_enter(&ip->i_interlock, MTX_DEF);
+ mtx_lock(&ip->i_interlock);
ip->i_usecount--;
if (ip->i_usecount < 0)
panic("ntfs_ntrele: ino: %d usecount: %d \n",
ip->i_number,ip->i_usecount);
- mtx_exit(&ip->i_interlock, MTX_DEF);
+ mtx_unlock(&ip->i_interlock);
}
/*
diff --git a/sys/ntfs/ntfs_vfsops.c b/sys/ntfs/ntfs_vfsops.c
index 7c6b2c0..384883e 100644
--- a/sys/ntfs/ntfs_vfsops.c
+++ b/sys/ntfs/ntfs_vfsops.c
@@ -196,9 +196,9 @@ ntfs_mountroot()
return (error);
}
- mtx_enter(&mountlist_mtx, MTX_DEF);
+ mtx_lock(&mountlist_mtx);
TAILQ_INSERT_TAIL(&mountlist, mp, mnt_list);
- mtx_exit(&mountlist_mtx, MTX_DEF);
+ mtx_unlock(&mountlist_mtx);
(void)ntfs_statfs(mp, &mp->mnt_stat, p);
vfs_unbusy(mp);
return (0);
OpenPOWER on IntegriCloud