From 5b6740880f63eda27d1a74ad839e8201383be546 Mon Sep 17 00:00:00 2001 From: Merlin Scholz Date: Thu, 27 Apr 2023 09:20:25 +0200 Subject: Fix log_memory sizeof in VFS subsystem --- sys/kern/vfs_vnode.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/vfs_vnode.c b/sys/kern/vfs_vnode.c index 5304c9964f6..2446f483e26 100644 --- a/sys/kern/vfs_vnode.c +++ b/sys/kern/vfs_vnode.c @@ -1569,7 +1569,7 @@ again: return error; new_vip = vcache_alloc(); #ifdef LOCKDOC - lockdoc_log_memory(1, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(1, "vnode_impl", new_vip, sizeof(*new_vip)); #endif new_vip->vi_key = vcache_key; vp = VIMPL_TO_VNODE(new_vip); @@ -1584,7 +1584,7 @@ again: /* If another thread beat us inserting this node, retry. */ if (vip != new_vip) { #ifdef LOCKDOC - lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(*new_vip)); #endif vcache_dealloc(new_vip); vfs_unbusy(mp); @@ -1599,7 +1599,7 @@ again: SLIST_REMOVE(&vcache_hashtab[hash & vcache_hashmask], new_vip, vnode_impl, vi_hash); #ifdef LOCKDOC - lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(*new_vip)); #endif vcache_dealloc(new_vip); vfs_unbusy(mp); @@ -1646,7 +1646,7 @@ vcache_new(struct mount *mp, struct vnode *dvp, struct vattr *vap, return error; vip = vcache_alloc(); #ifdef LOCKDOC - lockdoc_log_memory(1, "vnode_impl", vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(1, "vnode_impl", vip, sizeof(*vip)); #endif vip->vi_key.vk_mount = mp; vp = VIMPL_TO_VNODE(vip); @@ -1657,7 +1657,7 @@ vcache_new(struct mount *mp, struct vnode *dvp, struct vattr *vap, if (error) { mutex_enter(&vcache_lock); #ifdef LOCKDOC - lockdoc_log_memory(0, "vnode_impl", vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(0, "vnode_impl", vip, sizeof(*vip)); #endif vcache_dealloc(vip); vfs_unbusy(mp); @@ -1728,7 +1728,7 @@ vcache_rekey_enter(struct mount *mp, struct vnode *vp, new_vip = vcache_alloc(); #ifdef LOCKDOC - lockdoc_log_memory(1, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(1, "vnode_impl", new_vip, sizeof(*new_vip)); #endif new_vip->vi_key = new_vcache_key; @@ -1737,10 +1737,10 @@ vcache_rekey_enter(struct mount *mp, struct vnode *vp, vip = vcache_hash_lookup(&new_vcache_key, new_hash); if (vip != NULL) { #ifdef LOCKDOC - lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(*new_vip)); #endif vcache_dealloc(new_vip); - return EEXIST;.() + return EEXIST; } SLIST_INSERT_HEAD(&vcache_hashtab[new_hash & vcache_hashmask], new_vip, vi_hash); @@ -1806,7 +1806,7 @@ vcache_rekey_exit(struct mount *mp, struct vnode *vp, SLIST_REMOVE(&vcache_hashtab[new_hash & vcache_hashmask], new_vip, vnode_impl, vi_hash); #ifdef LOCKDOC - lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(vnode_impl_t)); + lockdoc_log_memory(0, "vnode_impl", new_vip, sizeof(*new_vip)); #endif vcache_dealloc(new_vip); } -- cgit