From nobody Mon Oct 6 18:23:07 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4cgSLg4yp4z6BJn2; Mon, 06 Oct 2025 18:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgSLg2XcSz444C; Mon, 06 Oct 2025 18:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759774987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hvGrro6Zm5mDazGAzW2/Aen3zqmz+XGm2U8aSQJw2A=; b=pkrqB8Wx7UKM8OpKcusPA0eZ5PvidhARFsZW2WvSl2zPYQVyNC094VJqtN280eJhJfB8T/ g5dbSmocizl86RIuRZiYkx/iQla9d9qTsVEi7lTNYPsO/SvUSViDtIuCcEE9HZe3Tmx/ll XIBZ0mq+sBxrWcWAC9vtnSo1ewB4Ljeiu1qe8H7yjkglJHV8Iw5xoZVl49V+v6lUcO3kxB b8eKbr3H/v8tpo+LyMbzmPCCF1ByeXoI3MqwWuGiZuGtbTHwELvwQ8Mlq/hdnal6Edfb3T V9A9tLeE9O9aFYwLSmI9u5zeOR1N3rFWUw9h9+aN9qS7Npa7WGhWC1qf0ZVcyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759774987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0hvGrro6Zm5mDazGAzW2/Aen3zqmz+XGm2U8aSQJw2A=; b=IKXE13/V852h+qyBo7VR2G7s2rGrozxMg+Rol+Mo3AsCp3sLxPoBYgYFhRZ9ZP/5OTkJj3 CBqGkunTlTiMzPuKne8ImeCSLa2sxIBwch8JtGeciX7emxVTM9MCtgQSceM3JNJ9IjEBgv PDrY6DHDgtPMAoK3uw8+UX5AO9C2ujJQnzf+WnXQkvRv6P22cfgAl7PMesK/D8CGAal9Lg 8KqZQRVzqBTi8LLHntEKVggVYZCzz3DTySGBAI0OAR5tH6ZHvTqdPvNoE4+XweqEjqgDr+ MZQFm6YC8TbSfRwaWpGlLQF33+pNe/30ntTmrV12MOL9pXYpVg9lwFFrFuy2LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759774987; a=rsa-sha256; cv=none; b=AF8uC8i037a4BfyLEq8aMbzcqJFUN/cFvPCU5kWmawuEV71qeu/vdbEBee6BhbZSX7jaOl CYM6G71tV15wckyLPB8NKZeNTligytEtkHdzZeZa0JBx3F97BVxKX0Fzc8BkHL1AEg7dmX Xk9i6WT87TSTRaOVj+QYxSOEH3mYjVQU94X/fQuKonxwrAlL9Gzep5kGm/GbPvFiAnXD3q neWXJzKzSAVQzIiXeMga95681zy3RMEpg4JqoJLkgmOzZMXDzeDw/dgAFsXCznExN4Q84o MeZun+CD8Dzke63dlKYGZ54EPPoJ/rg68NmDgfPCMDTwJBYPmMRhIfshNBe/KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cgSLg265Tz198k; Mon, 06 Oct 2025 18:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 596IN7VR084718; Mon, 6 Oct 2025 18:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596IN7oZ084715; Mon, 6 Oct 2025 18:23:07 GMT (envelope-from git) Date: Mon, 6 Oct 2025 18:23:07 GMT Message-Id: <202510061823.596IN7oZ084715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 84f981ba57e7 - main - nullfs: shrink null_node to 32 bytes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b commit 84f981ba57e77bd3c3d0fbf1469ce51bfd132a6b Author: Mateusz Guzik AuthorDate: 2025-10-06 17:59:17 +0000 Commit: Mateusz Guzik CommitDate: 2025-10-06 18:23:01 +0000 nullfs: shrink null_node to 32 bytes --- sys/fs/nullfs/null.h | 2 +- sys/fs/nullfs/null_subr.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/fs/nullfs/null.h b/sys/fs/nullfs/null.h index aa7a689bec34..ad3f7779e108 100644 --- a/sys/fs/nullfs/null.h +++ b/sys/fs/nullfs/null.h @@ -53,7 +53,7 @@ struct null_mount { * A cache of vnode references */ struct null_node { - CK_LIST_ENTRY(null_node) null_hash; /* Hash list */ + CK_SLIST_ENTRY(null_node) null_hash; /* Hash list */ struct vnode *null_lowervp; /* VREFed once */ struct vnode *null_vnode; /* Back pointer */ u_int null_flags; diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index ad8cd08279cc..bb0ff9966dfd 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -59,7 +59,7 @@ VFS_SMR_DECLARE; #define NULL_NHASH(vp) (&null_node_hashtbl[vfs_hash_index(vp) & null_hash_mask]) -static CK_LIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; +static CK_SLIST_HEAD(null_node_hashhead, null_node) *null_node_hashtbl; static struct rwlock null_hash_lock; static u_long null_hash_mask; @@ -116,7 +116,7 @@ null_hashget_locked(struct mount *mp, struct vnode *lowervp) * reference count (but NOT the lower vnode's VREF counter). */ hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -148,7 +148,7 @@ null_hashget(struct mount *mp, struct vnode *lowervp) vfs_smr_enter(); hd = NULL_NHASH(lowervp); - CK_LIST_FOREACH(a, hd, null_hash) { + CK_SLIST_FOREACH(a, hd, null_hash) { if (a->null_lowervp != lowervp) continue; /* @@ -189,7 +189,7 @@ null_hashins(struct mount *mp, struct null_node *xp) } } #endif - CK_LIST_INSERT_HEAD(hd, xp, null_hash); + CK_SLIST_INSERT_HEAD(hd, xp, null_hash); } static void @@ -305,9 +305,11 @@ null_nodeget(struct mount *mp, struct vnode *lowervp, struct vnode **vpp) void null_hashrem(struct null_node *xp) { + struct null_node_hashhead *hd; + hd = NULL_NHASH(xp->null_lowervp); rw_wlock(&null_hash_lock); - CK_LIST_REMOVE(xp, null_hash); + CK_SLIST_REMOVE(hd, xp, null_node, null_hash); rw_wunlock(&null_hash_lock); }