git: c8141e273a3e - main - nullfs: Fix some style after recent changes

The branch main has been updated by olce:

URL: https://cgit.FreeBSD.org/src/commit/?id=c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8

commit c8141e273a3eaf2f3fa05e9e5c2407c9538dd8f8
Author:     Olivier Certner <olce@FreeBSD.org>
AuthorDate: 2025-10-06 12:48:24 +0000
Commit:     Olivier Certner <olce@FreeBSD.org>
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 <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/rwlock.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
+#include <sys/rwlock.h>
 #include <sys/smr.h>
+#include <sys/vnode.h>
 
 #include <fs/nullfs/null.h>
 
@@ -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();