summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMerlin Scholz <merlin@scholz.ruhr>2023-08-23 01:44:24 +0200
committerMerlin Scholz <merlin@scholz.ruhr>2023-08-23 01:44:24 +0200
commit280762e2b1ada6722cf1cd155357d5940a489cf6 (patch)
tree97f1f09fc5b8eea704751bde55d2b191440e83f1
parent6545533869a1eba7272e380cbf5ca103e9181251 (diff)
Remove now (hopefully) unnecessary kmutex_t logginglockdoc-10.99.5-vfs-0.4lockdoc-10.99.5-vfs
-rw-r--r--sys/kern/vfs_bio.c5
-rw-r--r--sys/kern/vfs_mount.c6
-rw-r--r--sys/kern/vfs_vnode.c8
3 files changed, 0 insertions, 19 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1e64746bbb4..ddef0ba2e04 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -473,11 +473,6 @@ bufinit(void)
mutex_init(&bufcache_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&buffer_lock, MUTEX_DEFAULT, IPL_NONE);
-#ifdef LOCKDOC_VFS
- lockdoc_log_memory(1, "kmutex_t", &bufcache_lock, sizeof(kmutex_t));
- lockdoc_log_memory(1, "kmutex_t", &buffer_lock, sizeof(kmutex_t));
-#endif
-
cv_init(&needbuffer_cv, "needbuf");
if (bufmem_valimit != 0) {
diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c
index 2ee6fec9dd8..bcc65c0e62c 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -170,9 +170,6 @@ vfs_mountalloc(struct vfsops *vfsops, vnode_t *vp)
#ifdef LOCKDOC
lockdoc_log_memory(1, "mount", mp, sizeof(*mp));
- lockdoc_log_memory(1, "kmutex_t", mp->mnt_renamelock, sizeof(*mp->mnt_renamelock));
- lockdoc_log_memory(1, "kmutex_t", mp->mnt_vnodelock, sizeof(*mp->mnt_vnodelock));
- lockdoc_log_memory(1, "kmutex_t", mp->mnt_updating, sizeof(*mp->mnt_updating));
#endif
mutex_enter(&mountgen_lock);
@@ -327,9 +324,6 @@ vfs_rele(struct mount *mp)
#ifdef LOCKDOC
lockdoc_log_memory(0, "mount", mp, sizeof(*mp));
- lockdoc_log_memory(0, "kmutex_t", mp->mnt_renamelock, sizeof(*mp->mnt_renamelock));
- lockdoc_log_memory(0, "kmutex_t", mp->mnt_vnodelock, sizeof(*mp->mnt_vnodelock));
- lockdoc_log_memory(0, "kmutex_t", mp->mnt_updating, sizeof(*mp->mnt_updating));
#endif
specificdata_fini(mount_specificdata_domain, &mp->mnt_specdataref);
diff --git a/sys/kern/vfs_vnode.c b/sys/kern/vfs_vnode.c
index cc756763357..aad15f1678e 100644
--- a/sys/kern/vfs_vnode.c
+++ b/sys/kern/vfs_vnode.c
@@ -462,8 +462,6 @@ vnalloc_marker(struct mount *mp)
#ifdef LOCKDOC_VFS
lockdoc_log_memory(1, "vnode_impl", vip, sizeof(*vip));
- lockdoc_log_memory(1, "kmutex_t", vp->v_interlock, sizeof(*(vp->v_interlock)));
- lockdoc_log_memory(1, "krwlock_t", vp->v_uobj.vmobjlock, sizeof(*(vp->v_uobj.vmobjlock)));
#endif
return vp;
@@ -482,8 +480,6 @@ vnfree_marker(vnode_t *vp)
#ifdef LOCKDOC_VFS
lockdoc_log_memory(0, "vnode_impl", vip, sizeof(*vip));
- lockdoc_log_memory(0, "kmutex_t", vp->v_interlock, sizeof(*(vp->v_interlock)));
- lockdoc_log_memory(0, "krwlock_t", vp->v_uobj.vmobjlock, sizeof(*(vp->v_uobj.vmobjlock)));
#endif
mutex_obj_free(vp->v_interlock);
@@ -1414,8 +1410,6 @@ vcache_alloc(void)
#ifdef LOCKDOC_VFS
lockdoc_log_memory(1, "vnode_impl", vip, sizeof(*vip));
- lockdoc_log_memory(1, "kmutex_t", vp->v_interlock, sizeof(*(vp->v_interlock)));
- lockdoc_log_memory(1, "krwlock_t", vp->v_uobj.vmobjlock, sizeof(*(vp->v_uobj.vmobjlock)));
#endif
return vip;
@@ -1472,8 +1466,6 @@ vcache_free(vnode_impl_t *vip)
#ifdef LOCKDOC_VFS
lockdoc_log_memory(0, "vnode_impl", vip, sizeof(*vip));
- lockdoc_log_memory(0, "kmutex_t", vp->v_interlock, sizeof(*(vp->v_interlock)));
- lockdoc_log_memory(0, "krwlock_t", vp->v_uobj.vmobjlock, sizeof(*(vp->v_uobj.vmobjlock)));
#endif
mutex_obj_free(vp->v_interlock);