From nobody Mon Oct 06 15:22:45 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 4cgNLZ0NHcz69Wgv; Mon, 06 Oct 2025 15:22:46 +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 4cgNLY6v4rz3d5G; Mon, 06 Oct 2025 15:22:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764166; 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=0RREO6SmxzcfxgOL2RnFiwxuYZH+67k0zA2tURciLPc=; b=PgFRCc3hL8oHrvF0j6TixYG6EhMbcnW+bKCO2Ca1A+nnOOyZHM2YJbdZX62Lmlqmbt7rko vEaGND4Ycsxu1InnRRiR0qPLqTLpAJZxz8jWuUPT/uTu9y8pC7SK/4KgizdV56aR4pi7Fy cHNwMuJn+rC7vHjcxnEuN/WuA7ybQqaoGuWHepifKU3Xky6odcFr4faglMDDLnLXZ//yTj KsviZjwqLVQsvH5D9kJN5TaBNKt8XRFRQrZokw+HZ6Dr3EJGFrzPsxDlY/39YGhTiDfZWT iZ0S5gllzLQzbIm6lXHR0/GUVmEnVw1jKxGX885yb6a/IyXwmBqm5iXWwbvwDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759764166; 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=0RREO6SmxzcfxgOL2RnFiwxuYZH+67k0zA2tURciLPc=; b=UEgozJ05o2i6Ua0KgiH1K2EzYHEVAhEtWTJi3GwjsO2rmVK8R78Q7zSeN1jsyB0DvO23Zt jHaQ6yVEV4PIa7n6n3LmEHpDrAICAQ8JEEnC/vVp9YNbDvMtvkUFAo3Gkiz5zfAneMzfej 1Le9lKjNwyGVbUJuDdLhtkNOg3FzdOsdVbVU9srxrHd7aUtgNH2junp1S89ZyCFi01376O F1XOFkB88/VoMS2Pu2RlidarSrleN0zEVaXizd2hE5RZk36PJ6Plb47C7YQz4TjVh894KG VrmSOetFsDk2tT5fSau9TS78FfUq6Uw6QWcNMVK63GMJIMkgl0UVXv0nv+l9Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759764166; a=rsa-sha256; cv=none; b=MTVyZCRjzQBSzFnWeiD+UN3OYX/WOMQi2QMzXtYHjiNHqZcm5az/LUJahC+8Cy3PfCVgvM 1Trg/kL8RZ9BRcHDpD66Ierd6/8CBX5kKO4L/4Pcdh/FrYgKNHNUdOiy+/Jm00PtgibBRS Nz/+NFgV7m1eu0Q9BCU+wPh+8XsGQQUSAa2vkRCzT5Z3trtPbooZlpu0yguU08nKJnUhUv H3TixYoVbOIGEL69L41OPIRWzCBFRX1BxbSX2GIs9WPqZ8u8c8YbFhFzB6lyTbDAMvICSe v2LspVUDlhof8u3Y0bkY/l29UnpZ2DF3ThtEFbUKabSVjiKMVb1/6o28P7E1xA== 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 4cgNLY6Ppvz145F; Mon, 06 Oct 2025 15:22:45 +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 596FMjw2043822; Mon, 6 Oct 2025 15:22:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596FMjFQ043819; Mon, 6 Oct 2025 15:22:45 GMT (envelope-from git) Date: Mon, 6 Oct 2025 15:22:45 GMT Message-Id: <202510061522.596FMjFQ043819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: c8141e273a3e - main - nullfs: Fix some style after recent changes 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 commit c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8 Author: Olivier Certner AuthorDate: 2025-10-06 12:48:24 +0000 Commit: Olivier Certner CommitDate: 2025-10-06 15:21:40 +0000 nullfs: Fix some style after recent changes In 'nullfs_subr.c': - Sort the headers. - Use '__func__' in preference to the function's name in an assertion. This applies comments from D38761, one of which was missed and the other added too late. Reviewed by: kib MFC with: 249ec85352b5 ("nullfs: smr-protected hash lookup") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D52935 --- sys/fs/nullfs/null_subr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_subr.c b/sys/fs/nullfs/null_subr.c index 146d3bbdaedd..ad8cd08279cc 100644 --- a/sys/fs/nullfs/null_subr.c +++ b/sys/fs/nullfs/null_subr.c @@ -36,12 +36,12 @@ #include #include #include -#include #include #include #include -#include +#include #include +#include #include @@ -143,7 +143,7 @@ null_hashget(struct mount *mp, struct vnode *lowervp) struct vnode *vp; enum vgetstate vs; - ASSERT_VOP_LOCKED(lowervp, "null_hashget"); + ASSERT_VOP_LOCKED(lowervp, __func__); rw_assert(&null_hash_lock, RA_UNLOCKED); vfs_smr_enter();