diff options
| author | kib <kib@FreeBSD.org> | 2014-07-28 01:06:36 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2014-07-28 01:06:36 +0000 |
| commit | eb32c3f0ff295cf87cfd9dd5edae253b74524b8e (patch) | |
| tree | ead53a7652e567d849759eaf0579fb2b007bbdeb | |
| parent | 8c4ee72725acbad63cc510d19fa695facef006ab (diff) | |
| download | FreeBSD-src-eb32c3f0ff295cf87cfd9dd5edae253b74524b8e.zip FreeBSD-src-eb32c3f0ff295cf87cfd9dd5edae253b74524b8e.tar.gz | |
MFC r268610:
Add convenience macro to assert tmpfs node lock.
| -rw-r--r-- | sys/fs/tmpfs/tmpfs.h | 2 | ||||
| -rw-r--r-- | sys/fs/tmpfs/tmpfs_subr.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index afb116c..644f5a9 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -276,6 +276,8 @@ LIST_HEAD(tmpfs_node_list, tmpfs_node); #define TMPFS_NODE_LOCK(node) mtx_lock(&(node)->tn_interlock) #define TMPFS_NODE_UNLOCK(node) mtx_unlock(&(node)->tn_interlock) #define TMPFS_NODE_MTX(node) (&(node)->tn_interlock) +#define TMPFS_NODE_ASSERT_LOCKED(node) mtx_assert(TMPFS_NODE_MTX(node), \ + MA_OWNED) #ifdef INVARIANTS #define TMPFS_ASSERT_LOCKED(node) do { \ diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index e08c244..d8416d8 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -633,7 +633,7 @@ tmpfs_free_vp(struct vnode *vp) node = VP_TO_TMPFS_NODE(vp); - mtx_assert(TMPFS_NODE_MTX(node), MA_OWNED); + TMPFS_NODE_ASSERT_LOCKED(node); node->tn_vnode = NULL; if ((node->tn_vpstate & TMPFS_VNODE_WRECLAIM) != 0) wakeup(&node->tn_vnode); |
